cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-08-25 13:06:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

TG_Port_2

Browse Source 
Conflicts:
	code/game/objects/items/weapons/storage/backpack.dm
	code/game/objects/structures/crates_lockers/closets/secure/security.dm
	code/game/objects/structures/crates_lockers/closets/wardrobe.dm
	code/modules/client/preferences_gear.dm
	code/modules/clothing/under/accessories/accessory.dm
This commit is contained in:
SinTwo
2015-10-11 00:36:13 -04:00
committed by Neerti
parent 8eac3f8b9b
commit a2b24d64b7
13 changed files with 557 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
+18
View File
@@ -15,6 +15,10 @@
new /obj/item/weapon/storage/backpack/industrial(src)
else
new /obj/item/weapon/storage/backpack/satchel_eng(src)
if(prob(50))
new /obj/item/weapon/storage/backpack/dufflebag/eng(src)
else
return
if (prob(70))
new /obj/item/clothing/accessory/storage/brown_vest(src)
else
@@ -28,12 +32,14 @@
new /obj/item/clothing/shoes/brown(src)
new /obj/item/weapon/cartridge/ce(src)
new /obj/item/device/radio/headset/heads/ce(src)
new /obj/item/device/radio/headset/heads/ce/alt(src)
new /obj/item/weapon/storage/toolbox/mechanical(src)
new /obj/item/clothing/suit/storage/hazardvest(src)
new /obj/item/clothing/mask/gas(src)
new /obj/item/device/multitool(src)
new /obj/item/device/flash(src)
new /obj/item/taperoll/engineering(src)
new /obj/item/clothing/suit/hooded/wintercoat/engineering(src)
return
@@ -109,17 +115,23 @@
new /obj/item/weapon/storage/backpack/industrial(src)
else
new /obj/item/weapon/storage/backpack/satchel_eng(src)
if(prob(50))
new /obj/item/weapon/storage/backpack/dufflebag/eng(src)
else
return
if (prob(70))
new /obj/item/clothing/accessory/storage/brown_vest(src)
else
new /obj/item/clothing/accessory/storage/webbing(src)
new /obj/item/weapon/storage/toolbox/mechanical(src)
new /obj/item/device/radio/headset/headset_eng(src)
new /obj/item/device/radio/headset/headset_eng/alt(src)
new /obj/item/clothing/suit/storage/hazardvest(src)
new /obj/item/clothing/mask/gas(src)
new /obj/item/clothing/glasses/meson(src)
new /obj/item/weapon/cartridge/engineering(src)
new /obj/item/taperoll/engineering(src)
new /obj/item/clothing/suit/hooded/wintercoat/engineering(src)
return
/obj/structure/closet/secure_closet/atmos_personal
name = "technician's locker"
@@ -138,6 +150,10 @@
new /obj/item/weapon/storage/backpack/industrial(src)
else
new /obj/item/weapon/storage/backpack/satchel_eng(src)
if(prob(50))
new /obj/item/weapon/storage/backpack/dufflebag/eng(src)
else
return
if (prob(70))
new /obj/item/clothing/accessory/storage/brown_vest(src)
else
@@ -146,8 +162,10 @@
new /obj/item/device/flashlight(src)
new /obj/item/weapon/extinguisher(src)
new /obj/item/device/radio/headset/headset_eng(src)
new /obj/item/device/radio/headset/headset_eng/alt(src)
new /obj/item/clothing/suit/storage/hazardvest(src)
new /obj/item/clothing/mask/gas(src)
new /obj/item/weapon/cartridge/atmos(src)
new /obj/item/taperoll/engineering(src)
new /obj/item/clothing/suit/hooded/wintercoat/engineering/atmos(src)
return