cyberpresidentvanellope/Polaris
1
0
Fork 0
mirror of https://github.com/PolarisSS13/Polaris.git synced 2026-08-27 07:08:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

replaces atom.initialized with ATOM_INITIALIZED

Browse Source 
refactors atom/var/flags to atom_flags and area_flags
moves NOBLOODY, NOBLUDGEON, and PHORONGUARD to item_flags instead of atom_flags
corrects various misapplied flags
This commit is contained in:
spookerton
2022-10-18 09:36:36 +01:00
parent 650ee09942
commit 3abdbbaa1c
150 changed files with 414 additions and 431 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/power/cable.dm
+1 -1
View File
@@ -231,7 +231,7 @@ var/global/list/possible_cable_coil_colours = list(
shock(user, 5, 0.2)
else
if(!(W.flags & NOCONDUCT))
if(!(W.atom_flags & NOCONDUCT))
shock(user, 50, 0.7)
src.add_fingerprint(user)
code/modules/power/lighting.dm
+2 -2
View File
@@ -550,7 +550,7 @@ var/global/list/light_type_cache = list()
if(M == user)
continue
M.show_message("[user.name] smashed the light!", 3, "You hear a tinkle of breaking glass", 2)
if(on && !(W.flags & NOCONDUCT))
if(on && !(W.atom_flags & NOCONDUCT))
//if(!user.mutations & COLD_RESISTANCE)
if (prob(12))
electrocute_mob(user, get_area(src), src, 0.3)
@@ -570,7 +570,7 @@ var/global/list/light_type_cache = list()
return
to_chat(user, "You stick \the [W] into the light socket!")
if(has_power() && !(W.flags & NOCONDUCT))
if(has_power() && !(W.atom_flags & NOCONDUCT))
var/datum/effect_system/spark_spread/s = new /datum/effect_system/spark_spread
s.set_up(3, 1, src)
s.start()