cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-07-20 19:42:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

ERT

Browse Source
This commit is contained in:
DHA
2019-03-09 07:48:43 -08:00
parent 28fccd68c2
commit cc1cd0b3b2
3 changed files with 6 additions and 3 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."
vorestation.dme
+3 -3
View File
@@ -2156,13 +2156,13 @@
#include "code\modules\mob\living\silicon\robot\dogborg\dog_modules_vr.dm"
#include "code\modules\mob\living\silicon\robot\dogborg\dog_sleeper_vr.dm"
#include "code\modules\mob\living\silicon\robot\drone\drone.dm"
#include "code\modules\mob\living\silicon\robot\drone\drone_unify.dm"
#include "code\modules\mob\living\silicon\robot\drone\drone_abilities.dm"
#include "code\modules\mob\living\silicon\robot\drone\drone_console.dm"
#include "code\modules\mob\living\silicon\robot\drone\drone_damage.dm"
#include "code\modules\mob\living\silicon\robot\drone\drone_items.dm"
#include "code\modules\mob\living\silicon\robot\drone\drone_manufacturer.dm"
#include "code\modules\mob\living\silicon\robot\drone\drone_say.dm"
#include "code\modules\mob\living\silicon\robot\drone\drone_unify.dm"
#include "code\modules\mob\living\silicon\robot\robot_modules\event.dm"
#include "code\modules\mob\living\silicon\robot\robot_modules\station.dm"
#include "code\modules\mob\living\silicon\robot\robot_modules\station_vr.dm"
@@ -2173,7 +2173,6 @@
#include "code\modules\mob\living\simple_animal\corpse.dm"
#include "code\modules\mob\living\simple_animal\simple_animal.dm"
#include "code\modules\mob\living\simple_animal\simple_animal_vr.dm"
#include "code\modules\mob\living\simple_animal\mobject\mobjects.dm"
#include "code\modules\mob\living\simple_animal\simple_hud.dm"
#include "code\modules\mob\living\simple_animal\aliens\alien.dm"
#include "code\modules\mob\living\simple_animal\aliens\creature.dm"
@@ -2213,10 +2212,10 @@
#include "code\modules\mob\living\simple_animal\animals\snake_vr.dm"
#include "code\modules\mob\living\simple_animal\animals\spiderbot.dm"
#include "code\modules\mob\living\simple_animal\animals\synx.dm"
#include "code\modules\mob\living\simple_animal\animals\tarrasque.dm"
#include "code\modules\mob\living\simple_animal\animals\tomato.dm"
#include "code\modules\mob\living\simple_animal\animals\tree.dm"
#include "code\modules\mob\living\simple_animal\animals\worm.dm"
#include "code\modules\mob\living\simple_animal\animals\tarrasque.dm"
#include "code\modules\mob\living\simple_animal\animals\sif_wildlife\diyaab.dm"
#include "code\modules\mob\living\simple_animal\animals\sif_wildlife\savik.dm"
#include "code\modules\mob\living\simple_animal\animals\sif_wildlife\shantak.dm"
@@ -2233,6 +2232,7 @@
#include "code\modules\mob\living\simple_animal\humanoids\pirate.dm"
#include "code\modules\mob\living\simple_animal\humanoids\russian.dm"
#include "code\modules\mob\living\simple_animal\humanoids\syndicate.dm"
#include "code\modules\mob\living\simple_animal\mobject\mobjects.dm"
#include "code\modules\mob\living\simple_animal\slime\ai.dm"
#include "code\modules\mob\living\simple_animal\slime\combat.dm"
#include "code\modules\mob\living\simple_animal\slime\death.dm"