mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2025-12-10 18:22:39 +00:00
undefines our defines (#8506)
This commit is contained in:
10
code/__defines/projectile_cm.dm
Normal file
10
code/__defines/projectile_cm.dm
Normal file
@@ -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
|
||||
@@ -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
|
||||
|
||||
@@ -174,3 +174,10 @@
|
||||
var/obj/structure/closet/crate/C = new/obj/structure/closet/crate
|
||||
C.contents = objs
|
||||
C.loc = src.loc
|
||||
|
||||
#undef SERVERS
|
||||
#undef OPTIONS
|
||||
#undef RECEIVE
|
||||
#undef REC_CONF
|
||||
#undef SENDING
|
||||
#undef CHAT
|
||||
|
||||
@@ -692,4 +692,5 @@
|
||||
|
||||
#undef WARNING_DELAY
|
||||
|
||||
#undef SUPERMATTER_COUNTDOWN_TIME
|
||||
#undef SUPERMATTER_ACCENT_SOUND_COOLDOWN
|
||||
|
||||
@@ -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
|
||||
@@ -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
|
||||
|
||||
@@ -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'
|
||||
|
||||
@@ -164,3 +164,8 @@
|
||||
You can then travel to the new area to mine in that location.<br>
|
||||
<br>
|
||||
<font size=1>This technology produced under license from Thinktronic Systems, LTD.</font>"}
|
||||
|
||||
|
||||
#undef OUTPOST_Z
|
||||
#undef TRANSIT_Z
|
||||
#undef BELT_Z
|
||||
|
||||
@@ -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"
|
||||
|
||||
Reference in New Issue
Block a user