From 0ab421aabe95e14cbbc3bca94537aea2a85033cf Mon Sep 17 00:00:00 2001
From: Kashargul <144968721+Kashargul@users.noreply.github.com>
Date: Sun, 9 Jun 2024 18:58:36 +0200
Subject: [PATCH] undefines our defines (#8506)
---
code/__defines/projectile_cm.dm | 10 +++++
code/controllers/subsystems/reflect_ch.dm | 3 ++
.../interserver shipping/computer_yw.dm | 9 ++++-
code/modules/power/supermatter/supermatter.dm | 1 +
.../modules/projectiles/guns/projectile_ch.dm | 37 +++++++++----------
.../projectiles/projectile/bullets_ch.dm | 4 +-
code/modules/rogueminer_vr/zone_console.dm | 7 +++-
vorestation.dme | 1 +
8 files changed, 49 insertions(+), 23 deletions(-)
create mode 100644 code/__defines/projectile_cm.dm
diff --git a/code/__defines/projectile_cm.dm b/code/__defines/projectile_cm.dm
new file mode 100644
index 0000000000..cb549b3d46
--- /dev/null
+++ b/code/__defines/projectile_cm.dm
@@ -0,0 +1,10 @@
+#define NO_AUTO_LOAD 0
+#define OPEN_BOLT 1
+#define CLOSED_BOLT 2
+#define LOCK_OPEN_EMPTY 4
+#define LOCK_MANUAL_LOCK 8
+#define LOCK_SLAPPABLE 16
+#define CHAMBER_ON_RELOAD 32
+
+#define INTERNAL_MAG_SEPARATE 1
+#define IS_PUMP_SHOTGUN 2
diff --git a/code/controllers/subsystems/reflect_ch.dm b/code/controllers/subsystems/reflect_ch.dm
index 106f559357..0c8fcfa394 100644
--- a/code/controllers/subsystems/reflect_ch.dm
+++ b/code/controllers/subsystems/reflect_ch.dm
@@ -1,4 +1,5 @@
#define FIRE_PRIORITY_REFLECTOR 20
+
SUBSYSTEM_DEF(reflector)
name = "Reflectors"
priority = FIRE_PRIORITY_REFLECTOR
@@ -44,3 +45,5 @@ SUBSYSTEM_DEF(reflector)
return
current_thing = null
+
+#undef FIRE_PRIORITY_REFLECTOR
diff --git a/code/modules/interserver shipping/computer_yw.dm b/code/modules/interserver shipping/computer_yw.dm
index 41ff71cfae..ee3b70f479 100644
--- a/code/modules/interserver shipping/computer_yw.dm
+++ b/code/modules/interserver shipping/computer_yw.dm
@@ -173,4 +173,11 @@
/obj/machinery/intershipdeployer/proc/SpawnPackage(var/list/objs)
var/obj/structure/closet/crate/C = new/obj/structure/closet/crate
C.contents = objs
- C.loc = src.loc
\ No newline at end of file
+ C.loc = src.loc
+
+#undef SERVERS
+#undef OPTIONS
+#undef RECEIVE
+#undef REC_CONF
+#undef SENDING
+#undef CHAT
diff --git a/code/modules/power/supermatter/supermatter.dm b/code/modules/power/supermatter/supermatter.dm
index ed4a6a8149..98ce6ce8bf 100644
--- a/code/modules/power/supermatter/supermatter.dm
+++ b/code/modules/power/supermatter/supermatter.dm
@@ -692,4 +692,5 @@
#undef WARNING_DELAY
+#undef SUPERMATTER_COUNTDOWN_TIME
#undef SUPERMATTER_ACCENT_SOUND_COOLDOWN
diff --git a/code/modules/projectiles/guns/projectile_ch.dm b/code/modules/projectiles/guns/projectile_ch.dm
index 768331c771..9743479398 100644
--- a/code/modules/projectiles/guns/projectile_ch.dm
+++ b/code/modules/projectiles/guns/projectile_ch.dm
@@ -1,14 +1,3 @@
-#define NO_AUTO_LOAD 0
-#define OPEN_BOLT 1
-#define CLOSED_BOLT 2
-#define LOCK_OPEN_EMPTY 4
-#define LOCK_MANUAL_LOCK 8
-#define LOCK_SLAPPABLE 16
-#define CHAMBER_ON_RELOAD 32
-
-#define INTERNAL_MAG_SEPARATE 1
-#define IS_PUMP_SHOTGUN 2
-
#define BOLT_NOEVENT 0
#define BOLT_CLOSED 1
#define BOLT_OPENED 2
@@ -114,7 +103,7 @@
playsound(src, sound_ejectchamber, 50, 0)
user.visible_message("[user] pulls back \the [bolt_name] and locks it in the open position[casing_chambered][other_ejected].", \
"You pull back \the [bolt_name] and lock it in the open position[other_ejected][casing_chambered].")
- else
+ else
user.visible_message("[user] pulls back \the [bolt_name] before releasing it, causing it to lock in the open position[casing_chambered][other_ejected].", \
"You pull back \the [bolt_name] before releasing it, causing it to lock in the open position[casing_chambered][other_ejected].")
else
@@ -167,7 +156,7 @@
else
bolt_open = TRUE
var/ejected = process_chambered()
-
+
var/output = BOLT_OPENED
if(ejected) output |= BOLT_CASING_EJECTED
//if(chambering) output |= BOLT_CASING_CHAMBERED
@@ -300,7 +289,7 @@
chamber_bullet()
bolt_toggle()
playsound(src, 'sound/weapons/flipblade.ogg', 50, 1)
- user.hud_used.update_ammo_hud(user, src)
+ user.hud_used.update_ammo_hud(user, src)
if(SPEEDLOADER)
if(only_open_load && !bolt_open)
to_chat(user, "[src] must have its bolt open to be loaded!")
@@ -320,7 +309,7 @@
if(count)
user.visible_message("[user] reloads [src].", "You load [count] round\s into [src].")
playsound(src, 'sound/weapons/empty.ogg', 50, 1)
- user.hud_used.update_ammo_hud(user, src)
+ user.hud_used.update_ammo_hud(user, src)
AM.update_icon()
else if(istype(A, /obj/item/ammo_casing))
var/obj/item/ammo_casing/C = A
@@ -334,15 +323,15 @@
if(do_after(user,5))
user.visible_message("[user] slides \the [C] into the [src]'s chamber.","You slide \the [C] into the [src]'s chamber.")
chambered = C
- user.hud_used.update_ammo_hud(user, src)
+ user.hud_used.update_ammo_hud(user, src)
else
return
else if(!(CHECK_BITFIELD(auto_loading_type,LOCK_OPEN_EMPTY) || (CHECK_BITFIELD(auto_loading_type,LOCK_MANUAL_LOCK))))
if(do_after(user,15))
user.visible_message("[user] holds open \the [src]'s [bolt_name] and slides [C] into the chamber before letting the bolt close again.","You slide \the [C] into the [src]'s chamber.")
-
+
chambered = C
- user.hud_used.update_ammo_hud(user, src)
+ user.hud_used.update_ammo_hud(user, src)
else
return
else
@@ -372,7 +361,7 @@
loaded.Insert(1, C) //add to the head of the list
user.visible_message("[user] inserts \a [C] into [src].", "You insert \a [C] into [src].")
playsound(src, 'sound/weapons/empty.ogg', 50, 1)
- user.hud_used.update_ammo_hud(user, src)
+ user.hud_used.update_ammo_hud(user, src)
else if(istype(A, /obj/item/weapon/storage))
var/obj/item/weapon/storage/storage = A
@@ -386,7 +375,7 @@
continue
load_ammo(ammo, user)
- user.hud_used.update_ammo_hud(user, src)
+ user.hud_used.update_ammo_hud(user, src)
if(loaded.len >= max_shells)
to_chat(user, "[src] is full.")
@@ -495,3 +484,11 @@
if(!istype(P))
return
P.sub_velocity(P.velocity - 35)
+
+#undef BOLT_NOEVENT
+#undef BOLT_CLOSED
+#undef BOLT_OPENED
+#undef BOLT_LOCKED
+#undef BOLT_UNLOCKED
+#undef BOLT_CASING_EJECTED
+#undef BOLT_CASING_CHAMBERED
diff --git a/code/modules/projectiles/projectile/bullets_ch.dm b/code/modules/projectiles/projectile/bullets_ch.dm
index 108f3ff6ad..43504894c3 100644
--- a/code/modules/projectiles/projectile/bullets_ch.dm
+++ b/code/modules/projectiles/projectile/bullets_ch.dm
@@ -31,6 +31,8 @@ only use the hollow_point and armor_penetration values.*/
energy = max(0,energy - amount)
velocity = sqrt(2*energy/(grains / GRAINS_PER_KG))
+#undef GRAINS_PER_KG
+
//Pistol projectiles
/obj/item/projectile/bullet/pistol //9x19mm
fire_sound = 'sound/weapons/ballistics/a9mm.ogg'
@@ -568,4 +570,4 @@ only use the hollow_point and armor_penetration values.*/
/obj/item/projectile/bullet/pistol/medium/ap/suppressor/turbo // spicy boys
speed = 0.2 // this is 4x projectile speed
- hud_state = "monkey"
\ No newline at end of file
+ hud_state = "monkey"
diff --git a/code/modules/rogueminer_vr/zone_console.dm b/code/modules/rogueminer_vr/zone_console.dm
index 289d8aa598..22ee0d1d58 100644
--- a/code/modules/rogueminer_vr/zone_console.dm
+++ b/code/modules/rogueminer_vr/zone_console.dm
@@ -163,4 +163,9 @@
When a new zone has been scanned, your station's shuttle destination will be updated to direct it to the newly discovered area automatically.
You can then travel to the new area to mine in that location.
- This technology produced under license from Thinktronic Systems, LTD."}
\ No newline at end of file
+ This technology produced under license from Thinktronic Systems, LTD."}
+
+
+#undef OUTPOST_Z
+#undef TRANSIT_Z
+#undef BELT_Z
diff --git a/vorestation.dme b/vorestation.dme
index 0e56a4f737..fd5a8aaf3f 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -101,6 +101,7 @@
#include "code\__defines\process_scheduler.dm"
#include "code\__defines\procpath.dm"
#include "code\__defines\projectile.dm"
+#include "code\__defines\projectile_cm.dm"
#include "code\__defines\projectiles.dm"
#include "code\__defines\qdel.dm"
#include "code\__defines\recipe.dm"