shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #7338 from Citadel-Station-13/upstream-merge-38649

Browse Source 
[MIRROR] Converts antimagic from GetComponent to a signal
This commit is contained in:
deathride58
2018-07-10 01:59:14 -04:00
committed by GitHub
parent 21b6c7986b b3c28c36fa
commit 4f5eb02cca
4 changed files with 39 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__DEFINES/components.dm
+5 -1
View File
@@ -103,6 +103,10 @@
#define COMSIG_MOVABLE_THROW "movable_throw" //from base of atom/movable/throw_at(): (datum/thrownthing, spin)
#define COMSIG_MOVABLE_Z_CHANGED "movable_ztransit" //from base of atom/movable/onTransitZ(): (old_z, new_z)
// /mob Signals
#define COMSIG_MOB_RECEIVE_MAGIC "mob_receive_magic" //from base of mob/anti_magic_check(): (magic, holy, protection_sources)
#define COMPONENT_BLOCK_MAGIC 1
// /mob/living signals
#define COMSIG_LIVING_RESIST "living_resist" //from base of mob/living/resist() (/mob/living)
#define COMSIG_LIVING_IGNITED "living_ignite" //from base of mob/living/IgniteMob() (/mob/living)
@@ -201,4 +205,4 @@
//Ouch my toes!
#define CALTROP_BYPASS_SHOES 1
#define CALTROP_IGNORE_WALKERS 2
#define CALTROP_IGNORE_WALKERS 2