even more local defines (#16033)

This commit is contained in:
Kashargul
2024-06-12 12:57:31 +10:00
committed by GitHub
parent 7793329bfd
commit ab31632830
113 changed files with 619 additions and 459 deletions
@@ -251,3 +251,5 @@ var/global/list/image/splatter_cache=list()
/obj/effect/decal/cleanable/mucus/mapped/Destroy()
virus2.Cut()
return ..()
#undef DRYING_TIME
@@ -1,15 +1,5 @@
// Stolen en masse from N3X15 of /vg/station with much gratitude.
// The idea is to have 4 bits for coming and 4 for going.
#define TRACKS_COMING_NORTH 1
#define TRACKS_COMING_SOUTH 2
#define TRACKS_COMING_EAST 4
#define TRACKS_COMING_WEST 8
#define TRACKS_GOING_NORTH 16
#define TRACKS_GOING_SOUTH 32
#define TRACKS_GOING_EAST 64
#define TRACKS_GOING_WEST 128
// 5 seconds
#define TRACKS_CRUSTIFY_TIME 50
+2 -2
View File
@@ -2,7 +2,7 @@
// If emp_act() takes more than defined deciseconds (1/10 seconds) an admin message and log is created.
// I do not recommend having this uncommented on main server, it probably causes a bit more lag, espicially with larger EMPs.
// #define EMPDEBUG 10
// # define EMPDEBUG 10
/proc/empulse(turf/epicenter, first_range, second_range, third_range, fourth_range, log=0)
if(!epicenter) return
@@ -71,4 +71,4 @@
if((world.timeofday - time) >= EMPDEBUG)
log_and_message_admins("EMPDEBUG: [T.name] - [T.type] - took [world.timeofday - time]ds to process emp_act()!")
#endif
return 1
return 1
-4
View File
@@ -5,10 +5,6 @@
icon_state = "blueprints"
attack_verb = list("attacked", "bapped", "hit")
preserve_item = 1
var/const/AREA_ERRNONE = 0
var/const/AREA_STATION = 1
var/const/AREA_SPACE = 2
var/const/AREA_SPECIAL = 3
var/const/BORDER_ERROR = 0
var/const/BORDER_NONE = 1
-8
View File
@@ -55,14 +55,6 @@
/area/submap/casino_event
name = "\improper Space Casino"
//TG blueprints.
#define AREA_ERRNONE 0
#define AREA_STATION 1
#define AREA_SPACE 2
#define AREA_SPECIAL 3
/obj/item/areaeditor
name = "area modification item"
icon = 'icons/obj/items.dmi'
@@ -62,6 +62,10 @@
user.drop_from_inventory(src)
qdel(src)
#undef MODKIT_HELMET
#undef MODKIT_SUIT
#undef MODKIT_FULL
/obj/item/device/modkit/examine(mob/user)
. = ..()
. += "It looks as though it modifies hardsuits to fit [target_species] users."
@@ -1,7 +1,3 @@
#define PP_FUNCTIONAL 0
#define PP_BROKEN 1
#define PP_MISSING 2
var/global/list/paikeys = list()
/obj/item/device/paicard
+1
View File
@@ -365,4 +365,5 @@
#undef UAV_OFF
#undef UAV_ON
#undef UAV_PAIRING
#undef UAV_PACKED
@@ -1,9 +1,3 @@
//Define a macro that we can use to assemble all the circuit board names
#ifdef T_BOARD
#error T_BOARD already defined elsewhere, we can't use it.
#endif
#define T_BOARD(name) "circuit board (" + (name) + ")"
/obj/item/weapon/circuitboard
name = "circuit board"
icon = 'icons/obj/module.dmi'
@@ -1,7 +1,3 @@
#define MALFUNCTION_TEMPORARY 1
#define MALFUNCTION_PERMANENT 2
/obj/item/weapon/implant
name = "implant"
icon = 'icons/obj/device.dmi'
@@ -163,6 +163,7 @@ Protectiveness | Armor %
result = abs(result - 100)
return round(result)
#undef MATERIAL_ARMOR_COEFFICENT
/obj/item/clothing/proc/update_armor()
if(material)
@@ -410,4 +411,4 @@ Protectiveness | Armor %
icon_state = "material_armor_makeshift"
/obj/item/clothing/head/helmet/material/makeshift/durasteel
default_material = "durasteel"
default_material = "durasteel"
@@ -119,3 +119,6 @@
unfold()
if(unfoldable)
verbs -= /obj/structure/picnic_blanket_deployed/verb/fold_up
#undef CENTER
#undef SIDE
@@ -669,3 +669,5 @@ var/list/global/tank_gauge_cache = list()
unsense_proximity(callback = /atom/proc/HasProximity, center = old_loc)
if(isturf(loc))
sense_proximity(callback = /atom/proc/HasProximity)
#undef TANK_IDEAL_PRESSURE
@@ -39,6 +39,8 @@
src.add_fingerprint(user)
return
#undef NEST_RESIST_TIME
/obj/structure/bed/nest/user_buckle_mob(mob/M as mob, mob/user as mob)
if ( !ismob(M) || (get_dist(src, user) > 1) || (M.loc != src.loc) || user.restrained() || usr.stat || M.buckled || istype(user, /mob/living/silicon/pai) )
return
@@ -96,6 +96,7 @@
to_chat(user, "<span class='notice'>You put [I] in [src].</span>")
update_icon()
#undef TANK_DISPENSER_CAPACITY
/obj/structure/dispenser/tgui_act(action, params)
if(..())
@@ -119,4 +120,4 @@
oxygentanks--
. = TRUE
playsound(src, 'sound/items/drop/gascan.ogg', 100, 1, 1)
update_icon()
update_icon()