cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-11 10:22:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8884 from Ghommie/Ghommie-cit135

Browse Source 
Ports "About that beer I owed ya. Adds blueshirt items to sectech and defines them better."
This commit is contained in:
kevinz000
2019-07-14 03:37:36 -07:00
committed by GitHub
parent 3fb213425c 31bd9104bb
commit d5f156925d
5 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/clothing/head/helmet.dm
View File

@@ -54,6 +54,8 @@
tint = 2
/obj/item/clothing/head/helmet/blueshirt
name = "blue helmet"
desc = "A reliable, blue tinted helmet reminding you that you <i>still</i> owe that engineer a beer."
icon_state = "blueshift"
item_state = "blueshift"

4
code/modules/clothing/suits/armor.dm
View File

@@ -37,6 +37,8 @@
slowdown = 1
/obj/item/clothing/suit/armor/vest/blueshirt
name = "large armor vest"
desc = "A large, yet comfortable piece of armor, protecting you from some threats."
icon_state = "blueshift"
item_state = "blueshift"
@@ -59,7 +61,7 @@
flags_inv = 0
strip_delay = 80
unique_reskin = list("Coat" = "hostrench", "Cloak" = "trenchcloak")
/obj/item/clothing/suit/armor/vest/warden
name = "warden's jacket"
desc = "A navy-blue armored jacket with blue shoulder designations and '/Warden/' stitched into one of the chest pockets."

1
code/modules/clothing/under/jobs/security.dm
View File

@@ -142,6 +142,7 @@
*/
/obj/item/clothing/under/rank/security/blueshirt
name = "blue shirt and tie"
desc = "I'm a little busy right now, Calhoun."
icon_state = "blueshift"
item_state = "blueshift"

9
code/modules/vending/security.dm
View File

@@ -14,8 +14,13 @@
/obj/item/flashlight/seclite = 4,
/obj/item/restraints/legcuffs/bola/energy = 7)
contraband = list(/obj/item/clothing/glasses/sunglasses = 2,
/obj/item/storage/fancy/donut_box = 2)
premium = list(/obj/item/coin/antagtoken = 1)
/obj/item/storage/fancy/donut_box = 2,
/obj/item/ssword_kit = 1)
premium = list(/obj/item/coin/antagtoken = 1,
/obj/item/clothing/head/helmet/blueshirt = 1,
/obj/item/clothing/suit/armor/vest/blueshirt = 1,
/obj/item/clothing/under/rank/security/blueshirt = 1,
/obj/item/ssword_kit = 1)
armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50)
resistance_flags = FIRE_PROOF