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

Update jobs.dm

Browse Source
This commit is contained in:
deathride58
2017-11-22 14:48:35 -05:00
committed by GitHub
parent 5e6e725666
commit b24c9335b3
1 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/clothing/suits/jobs.dm
-5
View File
@@ -115,14 +115,9 @@
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"