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

Fixes bartender suit having an adjust state

Browse Source
This commit is contained in:
ShizCalev
2017-11-22 12:40:32 -06:00
committed by CitadelStationBot
parent dc0128a6d3
commit 6ab499b57b
36 changed files with 517 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/suits/armor.dm
+1 -1
View File
@@ -8,7 +8,7 @@
strip_delay = 60
equip_delay_other = 40
max_integrity = 250
resistance_flags = 0
resistance_flags = NONE
armor = list(melee = 30, bullet = 30, laser = 30, energy = 10, bomb = 25, bio = 0, rad = 0, fire = 50, acid = 50)
/obj/item/clothing/suit/armor/Initialize()
code/modules/clothing/suits/jobs.dm
+6
View File
@@ -115,8 +115,14 @@
icon_state = "hazard"
item_state = "hazard"
blood_overlay_type = "armor"
<<<<<<< HEAD
allowed = list(/obj/item/device/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/device/t_scanner, /obj/item/device/radio)
resistance_flags = 0
=======
allowed = list(/obj/item/device/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/plasmaman, /obj/item/device/t_scanner, /obj/item/device/radio)
resistance_flags = NONE
>>>>>>> b0f24a8... Fixes bartender suit having an adjust state (#32968)
//Lawyer
/obj/item/clothing/suit/toggle/lawyer
name = "blue suit jacket"
code/modules/clothing/suits/miscellaneous.dm
+4 -4
View File
@@ -16,7 +16,7 @@
blood_overlay_type = "armor"
body_parts_covered = CHEST
allowed = list (/obj/item/gun/energy/laser/bluetag)
resistance_flags = 0
resistance_flags = NONE
/obj/item/clothing/suit/redtag
name = "red laser tag armor"
@@ -26,7 +26,7 @@
blood_overlay_type = "armor"
body_parts_covered = CHEST
allowed = list (/obj/item/gun/energy/laser/redtag)
resistance_flags = 0
resistance_flags = NONE
/*
* Costume
@@ -95,7 +95,7 @@
w_class = WEIGHT_CLASS_NORMAL
allowed = list(/obj/item/device/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/toy)
flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT
resistance_flags = 0
resistance_flags = NONE
/obj/item/clothing/suit/hastur
name = "\improper Hastur's robe"
@@ -365,7 +365,7 @@
desc = "Pompadour not included."
icon_state = "leatherjacket"
item_state = "hostrench"
resistance_flags = 0
resistance_flags = NONE
max_heat_protection_temperature = ARMOR_MAX_TEMP_PROTECT
allowed = list(/obj/item/device/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/toy, /obj/item/storage/fancy/cigarettes, /obj/item/lighter, /obj/item/gun/ballistic/automatic/pistol, /obj/item/gun/ballistic/revolver, /obj/item/gun/ballistic/revolver/detective, /obj/item/device/radio)
code/modules/clothing/suits/utility.dm
+4 -4
View File
@@ -68,7 +68,7 @@
strip_delay = 70
equip_delay_other = 70
flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
resistance_flags = 0
resistance_flags = NONE
/obj/item/clothing/suit/bomb_suit
@@ -90,7 +90,7 @@
min_cold_protection_temperature = ARMOR_MIN_TEMP_PROTECT
strip_delay = 70
equip_delay_other = 70
resistance_flags = 0
resistance_flags = NONE
/obj/item/clothing/head/bomb_hood/security
@@ -125,7 +125,7 @@
strip_delay = 60
equip_delay_other = 60
flags_cover = HEADCOVERSEYES | HEADCOVERSMOUTH
resistance_flags = 0
resistance_flags = NONE
/obj/item/clothing/head/radiation/ComponentInitialize()
. = ..()
@@ -147,7 +147,7 @@
strip_delay = 60
equip_delay_other = 60
flags_inv = HIDEJUMPSUIT
resistance_flags = 0
resistance_flags = NONE
/obj/item/clothing/suit/radiation/ComponentInitialize()
. = ..()