cyberpresidentvanellope/Aurora-Old
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora-Old.git synced 2026-08-24 13:16:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

IPC Fixes

Browse Source 
IPCs can wear helmets without dying now, barring space helmets.
They don't get peppersprayed either, making them OP officers.
This commit is contained in:
Meowykins
2015-02-14 21:47:21 -06:00
parent e0d0c35bbb
commit 222052e5ba
2 changed files with 19 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/head/helmet.dm
+12 -7
View File
@@ -6,10 +6,6 @@
item_state = "helmet"
armor = list(melee = 50, bullet = 15, laser = 50,energy = 10, bomb = 25, bio = 0, rad = 0)
flags_inv = HIDEEARS|HIDEEYES
cold_protection = HEAD
min_cold_protection_temperature = HELMET_MIN_COLD_PROTECTION_TEMPERATURE
heat_protection = HEAD
max_heat_protection_temperature = HELMET_MAX_HEAT_PROTECTION_TEMPERATURE
siemens_coefficient = 0.7
w_class = 3
@@ -44,7 +40,6 @@
armor = list(melee = 80, bullet = 60, laser = 50,energy = 25, bomb = 50, bio = 10, rad = 0)
flags_inv = HIDEEARS|HIDEEYES
cold_protection = HEAD
min_cold_protection_temperature = SPACE_HELMET_MIN_COLD_PROTECTION_TEMPERATURE
siemens_coefficient = 0.5
/obj/item/clothing/head/helmet/thunderdome
@@ -55,7 +50,6 @@
item_state = "thunderdome"
armor = list(melee = 80, bullet = 60, laser = 50,energy = 10, bomb = 25, bio = 10, rad = 0)
cold_protection = HEAD
min_cold_protection_temperature = SPACE_HELMET_MIN_COLD_PROTECTION_TEMPERATURE
siemens_coefficient = 1
/obj/item/clothing/head/helmet/gladiator
@@ -75,4 +69,15 @@
flags = FPRINT|TABLEPASS|HEADCOVERSEYES
armor = list(melee = 62, bullet = 50, laser = 50,energy = 35, bomb = 10, bio = 2, rad = 0)
flags_inv = HIDEEARS
siemens_coefficient = 0.7
siemens_coefficient = 0.7
/obj/item/clothing/head/helmet/space // For spacesuit helmets. Removing the protection from the base helmets appears to have fucked them. Fixed with this, I believe.
name = "spaceasshole helmet"
desc = "shouldn't be able to see this"
icon_state = "n/a"
item_state = "n/a"
flags_inv = HIDEEARS|HIDEEYES
cold_protection = HEAD
min_cold_protection_temperature = HELMET_MIN_COLD_PROTECTION_TEMPERATURE
heat_protection = HEAD
max_heat_protection_temperature = HELMET_MAX_HEAT_PROTECTION_TEMPERATURE
code/modules/reagents/Chemistry-Reagents.dm
+7 -4
View File
@@ -2357,7 +2357,10 @@ datum
eyes_covered = 1
if ( !safe_thing )
safe_thing = victim.glasses
if ( eyes_covered && mouth_covered )
if(!(victim.species && !(victim.species.flags & IS_SYNTHETIC)))
victim << "\red your screen gets covered in some kind of spray."
return
else if ( eyes_covered && mouth_covered )
victim << "\red Your [safe_thing] protects you from the pepperspray!"
return
else if ( eyes_covered ) // Reduced effects if partially protected
@@ -2371,12 +2374,12 @@ datum
return
else if ( mouth_covered ) // Mouth cover is better than eye cover
victim << "\red Your [safe_thing] protects your face from the pepperspray!"
if (!(victim.species && (victim.species.flags & NO_PAIN)))
if (!(victim.species && (victim.species.flags & IS_PLANT)))
victim.emote("scream")
victim.eye_blurry = max(M.eye_blurry, 5)
return
else // Oh dear :D
if (!(victim.species && (victim.species.flags & NO_PAIN)))
else // Oh dear :D < - No idea what that's about. Looks like this is for unprotected people? The weird this is, it affects IPCs, because they have the no_pain flag. Might have a fix.
if (!(victim.species && (victim.species.flags & IS_PLANT)))
victim.emote("scream")
victim << "\red You're sprayed directly in the eyes with pepperspray!"
victim.eye_blurry = max(M.eye_blurry, 25)