Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/Fluffy-Frontier/FluffySTG
Browse files Browse the repository at this point in the history
…into upstream-mirror-25617
  • Loading branch information
Iajret committed Dec 17, 2023
2 parents 8a12e10 + a0dfe77 commit 4f5c5d6
Show file tree
Hide file tree
Showing 104 changed files with 1,578 additions and 2,558 deletions.
6 changes: 2 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,15 +39,13 @@ You are responsible for the testing of your content and providing proof of such

[Maps and Away Missions](.github/guides/MAPS_AND_AWAY_MISSIONS.md)

## :exclamation: How to compile :exclamation:

On **2021-01-04** we have changed the way to compile the codebase.
## Compilation

Find `BUILD.bat` here in the root folder of tgstation, and double click it to initiate the build. It consists of multiple steps and might take around 1-5 minutes to compile.

**The long way**. Find `bin/build.cmd` in this folder, and double click it to initiate the build. It consists of multiple steps and might take around 1-5 minutes to compile. If it closes, it means it has finished its job. You can then [setup the server](.github/guides/RUNNING_A_SERVER.md) normally by opening `tgstation.dmb` in DreamDaemon.

**Building tgstation in DreamMaker directly is now deprecated and might produce errors**, such as `'tgui.bundle.js': cannot find file`.
**Building tgstation in DreamMaker directly is deprecated and might produce errors**, such as `'tgui.bundle.js': cannot find file`.

**[How to compile in VSCode and other build options](tools/build/README.md).**

Expand Down
4 changes: 1 addition & 3 deletions code/__DEFINES/apc_defines.dm
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,8 @@
#define UPSTATE_BROKE (1<<3)
/// The APC is undergoing maintenance.
#define UPSTATE_MAINT (1<<4)
/// The APC is emagged or malfed.
#define UPSTATE_BLUESCREEN (1<<5)
/// The APCs wires are exposed.
#define UPSTATE_WIREEXP (1<<6)
#define UPSTATE_WIREEXP (1<<5)

// update_overlay
// Bitflags:
Expand Down
7 changes: 5 additions & 2 deletions code/__DEFINES/atom_hud.dm
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,8 @@
#define FAN_HUD "21"
/// Mech camera HUD
#define DIAG_CAMERA_HUD "22"
/// Steady Hacked APC effect, visible only to Malf AIs
#define MALF_APC_HUD "23"

// SKYRAT EDIT ADDITION BEGIN - gun permits and DNR
/// ammo of guns
Expand Down Expand Up @@ -72,8 +74,9 @@
#define DATA_HUD_SENTIENT_DISEASE 8
#define DATA_HUD_AI_DETECT 9
#define DATA_HUD_FAN 10
#define DATA_HUD_PERMIT 11 //SKYRAT EDIT
#define DATA_HUD_DNR 12 // SKYRAT EDIT
#define DATA_HUD_MALF_APC 11
#define DATA_HUD_PERMIT 12 //SKYRAT EDIT
#define DATA_HUD_DNR 13 // SKYRAT EDIT

/// cooldown for being shown the images for any particular data hud
#define ADD_HUD_TO_COOLDOWN 20
Expand Down
3 changes: 3 additions & 0 deletions code/__DEFINES/dcs/signals/signals_bitrunning.dm
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@
/// from /obj/effect/bitrunning/loot_signal: (points)
#define COMSIG_BITRUNNER_GOAL_POINT "bitrunner_goal_point"

/// from /obj/item/reagent_containers/pill
#define COMSIG_BITRUNNER_RED_PILL_SEVER "bitrunner_red_pill_sever"

// Netpods

/// from /obj/machinery/netpod/sever_connection()
Expand Down
6 changes: 5 additions & 1 deletion code/__DEFINES/diseases.dm
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,10 @@ DEFINE_BITFIELD(spread_flags, list(
//// Set to maximum # of cycles you want to be able to offset symptoms. Scales down linearly over time.
#define DISEASE_SYMPTOM_OFFSET_DURATION 100

///Symptom Frequency Modifier
/// Symptom Frequency Modifier
//// Raise to make symptoms fire less frequently, lower to make them fire more frequently. Keep at 0 or above.
#define DISEASE_SYMPTOM_FREQUENCY_MODIFIER 1

/// Minimum Chemical Cure Chance
//// Minimum per-cycle chance we want of being able to cure an advanced disease with the chemicals present.
#define DISEASE_MINIMUM_CHEMICAL_CURE_CHANCE 5
5 changes: 4 additions & 1 deletion code/__DEFINES/traits/declarations.dm
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,7 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
#define TRAIT_TUMOR_SUPPRESSED "brain_tumor_suppressed"
/// Prevents hallucinations from the hallucination brain trauma (RDS)
#define TRAIT_RDS_SUPPRESSED "rds_suppressed"
/// overrides the update_fire proc to always add fire (for lava)
/// mobs that have this trait cannot be extinguished
#define TRAIT_PERMANENTLY_ONFIRE "permanently_onfire"
/// Indicates if the mob is currently speaking with sign language
#define TRAIT_SIGN_LANG "sign_language"
Expand Down Expand Up @@ -818,6 +818,9 @@ Remember to update _globalvars/traits.dm if you're adding/removing/renaming trai
/// Trait given to mechs that can have orebox functionality on movement
#define TRAIT_OREBOX_FUNCTIONAL "orebox_functional"

///A trait for mechs that were created through the normal construction process, and not spawned by map or other effects.
#define TRAIT_MECHA_CREATED_NORMALLY "trait_mecha_created_normally"

///fish traits
#define TRAIT_RESIST_EMULSIFY "resist_emulsify"
#define TRAIT_FISH_SELF_REPRODUCE "fish_self_reproduce"
Expand Down
3 changes: 3 additions & 0 deletions code/_globalvars/traits/_traits.dm
Original file line number Diff line number Diff line change
Expand Up @@ -557,6 +557,9 @@ GLOBAL_LIST_INIT(traits_by_type, list(
/obj/vehicle = list(
"TRAIT_OREBOX_FUNCTIONAL" = TRAIT_OREBOX_FUNCTIONAL,
),
/obj/vehicle/sealed/mecha = list(
"TRAIT_MECHA_CREATED_NORMALLY" = TRAIT_MECHA_CREATED_NORMALLY
),
/turf = list(
"TRAIT_CHASM_STOPPED" = TRAIT_CHASM_STOPPED,
"TRAIT_FIREDOOR_STOP" = TRAIT_FIREDOOR_STOP,
Expand Down
42 changes: 22 additions & 20 deletions code/datums/components/caltrop.dm
Original file line number Diff line number Diff line change
Expand Up @@ -71,59 +71,61 @@
if(!ishuman(arrived))
return

var/mob/living/carbon/human/H = arrived
if(HAS_TRAIT(H, TRAIT_PIERCEIMMUNE))
var/mob/living/carbon/human/digitigrade_fan = arrived
if(HAS_TRAIT(digitigrade_fan, TRAIT_PIERCEIMMUNE))
return

if((flags & CALTROP_IGNORE_WALKERS) && H.move_intent == MOVE_INTENT_WALK)
if((flags & CALTROP_IGNORE_WALKERS) && digitigrade_fan.move_intent == MOVE_INTENT_WALK)
return

if(H.movement_type & MOVETYPES_NOT_TOUCHING_GROUND) //check if they are able to pass over us
if(digitigrade_fan.movement_type & MOVETYPES_NOT_TOUCHING_GROUND) //check if they are able to pass over us
//gravity checking only our parent would prevent us from triggering they're using magboots / other gravity assisting items that would cause them to still touch us.
return

if(H.buckled) //if they're buckled to something, that something should be checked instead.
if(digitigrade_fan.buckled) //if they're buckled to something, that something should be checked instead.
return

if(H.body_position == LYING_DOWN && !(flags & CALTROP_NOCRAWL)) //if we're not standing we cant step on the caltrop
if(digitigrade_fan.body_position == LYING_DOWN && !(flags & CALTROP_NOCRAWL)) //if we're not standing we cant step on the caltrop
return

var/picked_def_zone = pick(BODY_ZONE_L_LEG, BODY_ZONE_R_LEG)
var/obj/item/bodypart/O = H.get_bodypart(picked_def_zone)
if(!istype(O))
var/obj/item/bodypart/leg = digitigrade_fan.get_bodypart(picked_def_zone)
if(!istype(leg))
return

if(!IS_ORGANIC_LIMB(O))
if(!IS_ORGANIC_LIMB(leg))
return

if (!(flags & CALTROP_BYPASS_SHOES))
// SKYRAT EDIT ADDITION BEGIN - Hardened Soles Quirk
if(HAS_TRAIT(H, TRAIT_HARD_SOLES))
if(HAS_TRAIT(digitigrade_fan, TRAIT_HARD_SOLES))
return
// SKYRAT EDIT ADDITION END
if ((H.wear_suit?.body_parts_covered | H.w_uniform?.body_parts_covered | H.shoes?.body_parts_covered) & FEET)
if ((digitigrade_fan.wear_suit?.body_parts_covered | digitigrade_fan.w_uniform?.body_parts_covered | digitigrade_fan.shoes?.body_parts_covered) & FEET)
return

var/damage = rand(min_damage, max_damage)
if(HAS_TRAIT(H, TRAIT_LIGHT_STEP))
if(HAS_TRAIT(digitigrade_fan, TRAIT_LIGHT_STEP))
damage *= 0.75


if(!(flags & CALTROP_SILENT) && !H.has_status_effect(/datum/status_effect/caltropped))
H.apply_status_effect(/datum/status_effect/caltropped)
H.visible_message(
span_danger("[H] steps on [parent]."),
if(!(flags & CALTROP_SILENT) && !digitigrade_fan.has_status_effect(/datum/status_effect/caltropped))
digitigrade_fan.apply_status_effect(/datum/status_effect/caltropped)
digitigrade_fan.visible_message(
span_danger("[digitigrade_fan] steps on [parent]."),
span_userdanger("You step on [parent]!")
)

H.apply_damage(damage, BRUTE, picked_def_zone, wound_bonus = CANT_WOUND, attacking_item = parent)
digitigrade_fan.apply_damage(damage, BRUTE, picked_def_zone, wound_bonus = CANT_WOUND, attacking_item = parent)

if(!(flags & CALTROP_NOSTUN)) // Won't set off the paralysis.
H.Paralyze(paralyze_duration)

if(!HAS_TRAIT(digitigrade_fan, TRAIT_LIGHT_STEP))
digitigrade_fan.Paralyze(paralyze_duration)
else
digitigrade_fan.Knockdown(paralyze_duration)
if(!soundfile)
return
playsound(H, soundfile, 15, TRUE, -3)
playsound(digitigrade_fan, soundfile, 15, TRUE, -3)

/datum/component/caltrop/UnregisterFromParent()
if(ismovable(parent))
Expand Down
Loading

0 comments on commit 4f5c5d6

Please sign in to comment.