Undefines local defines and moves global to __define (#16028)

* first set of defines

* some more

* .

* final defines

* del local define
This commit is contained in:
Kashargul
2024-06-09 17:29:20 +10:00
committed by GitHub
parent 951cdf17b4
commit 6cabe9f7e6
85 changed files with 329 additions and 131 deletions
-5
View File
@@ -89,11 +89,6 @@
if (!BB)
. += "This one is spent."
//Gun loading types
#define SINGLE_CASING 1 //The gun only accepts ammo_casings. ammo_magazines should never have this as their mag_type.
#define SPEEDLOADER 2 //Transfers casings from the mag to the gun when used.
#define MAGAZINE 4 //The magazine item itself goes inside the gun
//An item that holds casings and can be used to put them inside guns
/obj/item/ammo_magazine
name = "magazine"
@@ -30,6 +30,10 @@
if(environment.temperature > HEATMODE_TEMP - 30)
. = TRUE
#undef LAVALAND_EQUIPMENT_EFFECT_PRESSURE
#undef HEATMODE_ATMOSPHERE
#undef HEATMODE_TEMP
/proc/offsite_environment_check(turf/simulated/T)
. = TRUE
if(!istype(T))
@@ -343,7 +347,6 @@
var/obj/effect/temp_visual/kinetic_blast/K = new /obj/effect/temp_visual/kinetic_blast(target_turf)
K.color = color
//Modkits
/obj/item/borg/upgrade/modkit
name = "kinetic accelerator modification kit"
@@ -732,3 +735,7 @@
/obj/item/borg/upgrade/modkit/tracer/adjustable/attack_self(mob/user)
bolt_color = input(user,"","Choose Color",bolt_color) as color|null
#undef KA_ENVIRO_TYPE_COLD
#undef KA_ENVIRO_TYPE_HOT
#undef KA_ENVIRO_TYPE_OFFSITE
@@ -270,3 +270,8 @@
/obj/item/weapon/gun/magnetic/matfed/phoronbore/loaded
cell = /obj/item/weapon/cell/apc
capacitor = /obj/item/weapon/stock_parts/capacitor
#undef GEN_STARTING
#undef GEN_OFF
#undef GEN_IDLE
#undef GEN_ACTIVE
@@ -1,7 +1,3 @@
#define HOLD_CASINGS 0 //do not do anything after firing. Manual action, like pump shotguns, or guns that want to define custom behaviour
#define EJECT_CASINGS 1 //drop spent casings on the ground after firing
#define CYCLE_CASINGS 2 //experimental: cycle casings, like a revolver. Also works for multibarrelled guns
/obj/item/weapon/gun/projectile
name = "gun"
desc = "A gun that fires bullets."
+3
View File
@@ -852,3 +852,6 @@
if(silenced)
volume = 5
playsound(A, hitsound_wall, volume, 1, -1)
#undef MOVES_HITSCAN
#undef MUZZLE_EFFECT_PIXEL_INCREMENT