cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-22 19:46:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #514 from Docosahexaenoic-Acid/SWAT-ERT

Browse Source 
Tactical ERT Gear was not so Tactical
This commit is contained in:
Vollybally
2019-03-10 13:45:54 -04:00
committed by GitHub
parent 9fdca861ae cc1cd0b3b2
commit 3edfbd0357
2 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/gloves/miscellaneous.dm
+2
View File
@@ -34,6 +34,7 @@
min_cold_protection_temperature = GLOVES_MIN_COLD_PROTECTION_TEMPERATURE
heat_protection = HANDS
max_heat_protection_temperature = GLOVES_MAX_HEAT_PROTECTION_TEMPERATURE
armor = list(melee = 30, bullet = 10, laser = 10, energy = 15, bomb = 20, bio = 0, rad = 0)
/obj/item/clothing/gloves/combat //Combined effect of SWAT gloves and insulated gloves
desc = "These tactical gloves are somewhat fire and impact resistant."
@@ -46,6 +47,7 @@
min_cold_protection_temperature = GLOVES_MIN_COLD_PROTECTION_TEMPERATURE
heat_protection = HANDS
max_heat_protection_temperature = GLOVES_MAX_HEAT_PROTECTION_TEMPERATURE
armor = list(melee = 30, bullet = 10, laser = 10, energy = 15, bomb = 20, bio = 0, rad = 0)
/obj/item/clothing/gloves/warden
desc = "These black gloves scream of prisoner abuse"
code/modules/clothing/under/miscellaneous.dm
+1
View File
@@ -94,6 +94,7 @@
desc = "A short-sleeved black uniform, paired with grey digital-camo cargo pants. It looks very tactical."
icon_state = "ert_uniform"
item_state_slots = list(slot_r_hand_str = "black", slot_l_hand_str = "black")
armor = list(melee = 10, bullet = 5, laser = 5,energy = 0, bomb = 0, bio = 0, rad = 0)
/obj/item/clothing/under/gov
desc = "A neat proper uniform of someone on offical business. The collar is <i>immaculately</i> starched."