cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-21 19:17:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

Changes the is_changeling and is_mindslave procs into proper defines (#25212)

Browse Source 
* Changes these procs into proper defines

* Henri review
This commit is contained in:
DGamerL
2024-04-28 20:57:26 +00:00
committed by GitHub
parent fc7acc4597
commit fb027f73dd
24 changed files with 34 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/reagents/chemistry/reagents/drugs.dm
+4 -4
View File
@@ -883,7 +883,7 @@
game_plane_master_controller.add_filter(MEPHEDRONE_SCREEN_BLUR, 1, list("type" = "radial_blur", "size" = 0.02))
if(!ischangeling(L) || HAS_TRAIT(L, TRAIT_MEPHEDRONE_ADAPTED))
if(!IS_CHANGELING(L) || HAS_TRAIT(L, TRAIT_MEPHEDRONE_ADAPTED))
return
var/datum/antagonist/changeling/cling = L.mind.has_antag_datum(/datum/antagonist/changeling)
cling.chem_recharge_slowdown += 1
@@ -901,7 +901,7 @@
if(overdosed)
UnregisterSignal(L, COMSIG_ATOM_PREHIT)
if(ischangeling(L))
if(IS_CHANGELING(L))
var/datum/antagonist/changeling/cling = L.mind.has_antag_datum(/datum/antagonist/changeling)
cling.chem_recharge_slowdown -= changeling_chemical_tracker
changeling_chemical_tracker = 0
@@ -1014,7 +1014,7 @@
RegisterSignal(L, COMSIG_ATOM_PREHIT, PROC_REF(dodge_bullets))
L.next_move_modifier -= 0.2 // Overdosing makes you a liiitle faster but you know has some really bad consequences
if(ischangeling(L))
if(IS_CHANGELING(L))
var/datum/antagonist/changeling/cling = L.mind.has_antag_datum(/datum/antagonist/changeling)
cling.chem_recharge_slowdown += 1
changeling_chemical_tracker += 1
@@ -1036,7 +1036,7 @@
L.next_move_modifier += 0.2
if(ischangeling(L))
if(IS_CHANGELING(L))
var/datum/antagonist/changeling/cling = L.mind.has_antag_datum(/datum/antagonist/changeling)
if(changeling_chemical_tracker > 0) //Just in case this gets called somehow after on_remove is done
cling.chem_recharge_slowdown -= 1
code/modules/reagents/chemistry/reagents/medicine.dm
+1 -1
View File
@@ -905,7 +905,7 @@
if(method == REAGENT_INGEST || (method == REAGENT_TOUCH && prob(25)))
if(M.stat == DEAD)
if(M.getBruteLoss() + M.getFireLoss() + M.getCloneLoss() >= 150)
if(ischangeling(M))
if(IS_CHANGELING(M))
return
M.delayed_gib(TRUE)
return