cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-07-20 11:32:51 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4018 from MisterLayne/10/4/2017_DufflebagsSci

Browse Source 
Science Dufflebag
This commit is contained in:
Anewbe
2017-10-06 10:51:05 -05:00
committed by GitHub
parent 7266310755 8aed98be14
commit ccd90031fa
5 changed files with 25 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/storage/backpack.dm
+5
View File
@@ -180,6 +180,11 @@
desc = "A large dufflebag for holding extra tools and supplies."
icon_state = "duffle_eng"
/obj/item/weapon/storage/backpack/dufflebag/sci
name = "science dufflebag"
desc = "A large dufflebag for holding circuits and beakers."
icon_state = "duffle_sci"
/*
* Satchel Types
*/
code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
+4
View File
@@ -20,6 +20,10 @@
new /obj/item/clothing/mask/gas(src)
new /obj/item/clothing/suit/storage/hooded/wintercoat/science(src)
new /obj/item/clothing/shoes/boots/winter/science(src)
if(prob(50))
new /obj/item/weapon/storage/backpack/dufflebag/sci(src)
else
new /obj/item/weapon/storage/backpack/toxins(src)
return
code/game/objects/structures/crates_lockers/closets/wardrobe.dm
+16 -6
View File
@@ -369,11 +369,15 @@
new /obj/item/clothing/suit/storage/hooded/wintercoat/science(src)
new /obj/item/clothing/shoes/boots/winter/science(src)
new /obj/item/weapon/storage/backpack/toxins(src)
new /obj/item/weapon/storage/backpack/toxins(src)
new /obj/item/weapon/storage/backpack/satchel/tox(src)
new /obj/item/weapon/storage/backpack/satchel/tox(src)
return
if(prob(50))
new /obj/item/weapon/storage/backpack/dufflebag/sci(src)
else
new /obj/item/weapon/storage/backpack/satchel/tox(src)
if(prob(50))
new /obj/item/weapon/storage/backpack/dufflebag/sci(src)
else
new /obj/item/weapon/storage/backpack/satchel/tox(src)
/obj/structure/closet/wardrobe/robotics_black
name = "robotics wardrobe"
icon_state = "black"
@@ -390,9 +394,15 @@
new /obj/item/clothing/gloves/black(src)
new /obj/item/clothing/gloves/black(src)
new /obj/item/weapon/storage/backpack/toxins(src)
new /obj/item/weapon/storage/backpack/toxins(src)
new /obj/item/weapon/storage/backpack/satchel/tox(src)
if(prob(50))
new /obj/item/weapon/storage/backpack/dufflebag/sci(src)
else
new /obj/item/weapon/storage/backpack/satchel/tox(src)
new /obj/item/weapon/storage/backpack/satchel/tox(src)
if(prob(50))
new /obj/item/weapon/storage/backpack/dufflebag/sci(src)
else
new /obj/item/weapon/storage/backpack/satchel/tox(src)
return