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

Merge pull request #8547 from Ghommie/Ghommie-cit29

Browse Source 
Moves traits to datums and turn the accessors into defines
This commit is contained in:
kevinz000
2019-06-08 01:22:16 -07:00
committed by GitHub
parent a6d7e618f1 d3d2b8d898
commit ab565d2483
186 changed files with 587 additions and 598 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/power/lighting.dm
+1 -1
View File
@@ -604,7 +604,7 @@
else
prot = 1
if(prot > 0 || user.has_trait(TRAIT_RESISTHEAT) || user.has_trait(TRAIT_RESISTHEATHANDS))
if(prot > 0 || HAS_TRAIT(user, TRAIT_RESISTHEAT) || HAS_TRAIT(user, TRAIT_RESISTHEATHANDS))
to_chat(user, "<span class='notice'>You remove the light [fitting].</span>")
else if(istype(user) && user.dna.check_mutation(TK))
to_chat(user, "<span class='notice'>You telekinetically remove the light [fitting].</span>")