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

Adds framework for equip delays and adds it to the straight jacket

Browse Source
This commit is contained in:
CitadelStationBot
2017-06-19 22:06:18 -05:00
parent f97540247f
commit 989b991b05
21 changed files with 72 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/suits/armor.dm
+3 -3
View File
@@ -6,7 +6,7 @@
heat_protection = CHEST|GROIN
max_heat_protection_temperature = ARMOR_MAX_TEMP_PROTECT
strip_delay = 60
put_on_delay = 40
equip_delay_other = 40
obj_integrity = 250
max_integrity = 250
resistance_flags = 0
@@ -107,7 +107,7 @@
heat_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
armor = list(melee = 50, bullet = 10, laser = 10, energy = 10, bomb = 0, bio = 0, rad = 0, fire = 80, acid = 80)
strip_delay = 80
put_on_delay = 60
equip_delay_other = 60
/obj/item/clothing/suit/armor/bone
name = "bone armor"
@@ -126,7 +126,7 @@
blood_overlay_type = "armor"
armor = list(melee = 15, bullet = 60, laser = 10, energy = 10, bomb = 40, bio = 0, rad = 0, fire = 50, acid = 50)
strip_delay = 70
put_on_delay = 50
equip_delay_other = 50
/obj/item/clothing/suit/armor/laserproof
name = "reflector vest"
code/modules/clothing/suits/bio.dm
+2 -2
View File
@@ -25,7 +25,7 @@
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 20, fire = 30, acid = 100)
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
strip_delay = 70
put_on_delay = 70
equip_delay_other = 70
resistance_flags = ACID_PROOF
//Standard biosuit, orange stripe
@@ -85,4 +85,4 @@
icon_state = "plaguedoctor"
item_state = "bio_suit"
strip_delay = 40
put_on_delay = 20
equip_delay_other = 20
code/modules/clothing/suits/miscellaneous.dm
+1
View File
@@ -317,6 +317,7 @@
item_state = "straight_jacket"
body_parts_covered = CHEST|GROIN|LEGS|ARMS|HANDS
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
equip_delay_self = 50
strip_delay = 60
breakouttime = 3000
code/modules/clothing/suits/utility.dm
+5 -5
View File
@@ -27,7 +27,7 @@
cold_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
min_cold_protection_temperature = FIRE_SUIT_MIN_TEMP_PROTECT
strip_delay = 60
put_on_delay = 60
equip_delay_other = 60
resistance_flags = FIRE_PROOF
/obj/item/clothing/suit/fire/firefighter
@@ -64,7 +64,7 @@
heat_protection = HEAD
max_heat_protection_temperature = HELMET_MAX_TEMP_PROTECT
strip_delay = 70
put_on_delay = 70
equip_delay_other = 70
flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
resistance_flags = 0
@@ -87,7 +87,7 @@
cold_protection = CHEST|GROIN|LEGS|FEET|ARMS|HANDS
min_cold_protection_temperature = ARMOR_MIN_TEMP_PROTECT
strip_delay = 70
put_on_delay = 70
equip_delay_other = 70
resistance_flags = 0
@@ -112,7 +112,7 @@
flags_inv = HIDEMASK|HIDEEARS|HIDEFACE|HIDEEYES|HIDEHAIR|HIDEFACIALHAIR
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 60, rad = 100, fire = 30, acid = 30)
strip_delay = 60
put_on_delay = 60
equip_delay_other = 60
flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
resistance_flags = 0
@@ -130,6 +130,6 @@
slowdown = 1.5
armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 60, rad = 100, fire = 30, acid = 30)
strip_delay = 60
put_on_delay = 60
equip_delay_other = 60
flags_inv = HIDEJUMPSUIT
resistance_flags = 0
code/modules/clothing/suits/wiz_robe.dm
+2 -2
View File
@@ -6,7 +6,7 @@
permeability_coefficient = 0.01
armor = list(melee = 30, bullet = 20, laser = 20, energy = 20, bomb = 20, bio = 20, rad = 20, fire = 100, acid = 100)
strip_delay = 50
put_on_delay = 50
equip_delay_other = 50
resistance_flags = FIRE_PROOF | ACID_PROOF
dog_fashion = /datum/dog_fashion/head/blue_wizard
@@ -70,7 +70,7 @@
allowed = list(/obj/item/weapon/teleportation_scroll)
flags_inv = HIDEJUMPSUIT
strip_delay = 50
put_on_delay = 50
equip_delay_other = 50
resistance_flags = FIRE_PROOF | ACID_PROOF
/obj/item/clothing/suit/wizrobe/red