cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 11:37:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

#undef is now required for all file defines (#24091)

Browse Source 
* CI

* undef

* hooooly crap

* yeah

* false by default

* fixes

* alright, there we go

* oops lmao

* lol, lmao even

* proper programming

* fix

* losin my mind

* oops

* yeah coloring

* WE LOVE MULTIPLE DEFINES (ive lost my sanity)
This commit is contained in:
Contrabang
2024-03-11 14:03:30 -04:00
committed by GitHub
parent 47f3b87a9f
commit e32544e599
172 changed files with 1412 additions and 780 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/cleaning.dm
+2
View File
@@ -54,3 +54,5 @@
/atom/proc/post_clean(atom/target, mob/user) //For specific cleaning object behaviors after cleaning, such as mops making floors slippery.
return
#undef CMAG_CLEANTIME
code/game/objects/effects/decals/Cleanable/tracks.dm
+2
View File
@@ -150,3 +150,5 @@ GLOBAL_LIST_EMPTY(fluidtrack_cache)
return TRUE
#undef ALWAYS_IN_GRAVITY
#undef TRACKS_CRUSTIFY_TIME
code/game/objects/items/devices/scanners.dm
+3 -3
View File
@@ -554,13 +554,13 @@ REAGENT SCANNER
for(var/V in SSweather.processing)
var/datum/weather/W = V
if(W.barometer_predictable && (T.z in W.impacted_z_levels) && W.area_type == user_area.type && !(W.stage == END_STAGE))
if(W.barometer_predictable && (T.z in W.impacted_z_levels) && W.area_type == user_area.type && !(W.stage == WEATHER_END_STAGE))
ongoing_weather = W
break
if(ongoing_weather)
if((ongoing_weather.stage == MAIN_STAGE) || (ongoing_weather.stage == WIND_DOWN_STAGE))
to_chat(user, "<span class='warning'>[src]'s barometer function can't trace anything while the storm is [ongoing_weather.stage == MAIN_STAGE ? "already here!" : "winding down."]</span>")
if((ongoing_weather.stage == WEATHER_MAIN_STAGE) || (ongoing_weather.stage == WEATHER_WIND_DOWN_STAGE))
to_chat(user, "<span class='warning'>[src]'s barometer function can't trace anything while the storm is [ongoing_weather.stage == WEATHER_MAIN_STAGE ? "already here!" : "winding down."]</span>")
return
to_chat(user, "<span class='notice'>The next [ongoing_weather] will hit in [butchertime(ongoing_weather.next_hit_time - world.time)].</span>")
code/game/objects/items/tools/multitool.dm
+4
View File
@@ -183,3 +183,7 @@
/obj/item/multitool/abductor/Initialize(mapload)
. = ..()
ADD_TRAIT(src, TRAIT_SHOW_WIRE_INFO, ROUNDSTART_TRAIT)
#undef PROXIMITY_NONE
#undef PROXIMITY_ON_SCREEN
#undef PROXIMITY_NEAR
code/game/objects/items/tools/welder.dm
+2
View File
@@ -318,3 +318,5 @@
icon_state = "brasswelder"
item_state = "brasswelder"
resistance_flags = FIRE_PROOF | ACID_PROOF
#undef GET_FUEL
code/game/objects/items/weapons/RCD.dm
+7
View File
@@ -703,3 +703,10 @@
#undef MATTER_100
#undef MATTER_500
#undef TAB_AIRLOCK_TYPE
#undef TAB_AIRLOCK_ACCESS
#undef MODE_TURF
#undef MODE_AIRLOCK
#undef MODE_WINDOW
#undef MODE_DECON
code/game/objects/items/weapons/bio_chips/bio_chip.dm
+1 -19
View File
@@ -1,22 +1,3 @@
/// If used, an implant will trigger when an emote is intentionally used.
#define BIOCHIP_EMOTE_TRIGGER_INTENTIONAL (1<<0)
/// If used, an implant will trigger when an emote is forced/unintentionally used.
#define BIOCHIP_EMOTE_TRIGGER_UNINTENTIONAL (1<<1)
/// If used, an implant will always trigger when the user makes an emote.
#define BIOCHIP_EMOTE_TRIGGER_ALWAYS (BIOCHIP_EMOTE_TRIGGER_UNINTENTIONAL | BIOCHIP_EMOTE_TRIGGER_INTENTIONAL)
/// If used, an implant will trigger on the user's first death.
#define BIOCHIP_TRIGGER_DEATH_ONCE (1<<2)
/// If used, an implant will trigger any time a user dies.
#define BIOCHIP_TRIGGER_DEATH_ANY (1<<3)
/// If used, an implant will NOT trigger on death when a user is gibbed.
#define BIOCHIP_TRIGGER_NOT_WHEN_GIBBED (1<<4)
// Defines related to the way that the implant is activated. This is the value for implant.activated
/// The implant is passively active (like a mindshield)
#define BIOCHIP_ACTIVATED_PASSIVE 0
/// The implant is activated manually by a trigger
#define BIOCHIP_ACTIVATED_ACTIVE 1
/**
* # Implants
*
@@ -245,3 +226,4 @@
/obj/item/bio_chip/dropped(mob/user)
. = TRUE
..()
code/game/objects/structures/false_walls.dm
+2
View File
@@ -433,3 +433,5 @@
canSmoothWith = list(SMOOTH_GROUP_ASTEROID_WALLS)
mineral = /obj/item/stack/ore/glass/basalt/ancient
walltype = /turf/simulated/mineral/ancient
#undef FALSEDOOR_MAX_PRESSURE_DIFF