[MIRROR] Undefines local defines and moves global to __define (#8502)

Co-authored-by: Kashargul <144968721+Kashargul@users.noreply.github.com>
Co-authored-by: Kashargul <KashL@t-online.de>
This commit is contained in:
CHOMPStation2
2024-06-09 09:26:41 -07:00
committed by GitHub
parent 130155c90d
commit 15863e00f8
85 changed files with 325 additions and 127 deletions

View File

@@ -93,11 +93,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"

View File

@@ -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"
@@ -726,3 +729,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

View File

@@ -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

View File

@@ -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."

View File

@@ -864,3 +864,6 @@
if(silenced)
volume = 5
playsound(A, hitsound_wall, volume, 1, -1)
#undef MOVES_HITSCAN
#undef MUZZLE_EFFECT_PIXEL_INCREMENT