cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-01-03 06:01:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8583 from FalseIncarnate/coffee

Browse Source 
Coffee Mugs and Vendor Change
This commit is contained in:
tigercat2000
2018-03-03 10:32:54 -08:00
committed by GitHub
parent f0d406f6ec 3b37c1c48c
commit 693e188362
12 changed files with 359 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
View File

@@ -35,6 +35,7 @@
new /obj/item/clothing/head/beret/eng(src)
new /obj/item/weapon/door_remote/chief_engineer(src)
new /obj/item/weapon/rpd(src)
new /obj/item/weapon/reagent_containers/food/drinks/mug/ce(src)
/obj/structure/closet/secure_closet/engineering_electrical

1
code/game/objects/structures/crates_lockers/closets/secure/medical.dm
View File

@@ -183,6 +183,7 @@
new /obj/item/weapon/reagent_containers/hypospray/CMO(src)
new /obj/item/organ/internal/cyberimp/eyes/hud/medical(src)
new /obj/item/weapon/door_remote/chief_medical_officer(src)
new /obj/item/weapon/reagent_containers/food/drinks/mug/cmo(src)
/obj/structure/closet/secure_closet/animal

1
code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
View File

@@ -71,6 +71,7 @@
new /obj/item/device/flash(src)
new /obj/item/device/laser_pointer(src)
new /obj/item/weapon/door_remote/research_director(src)
new /obj/item/weapon/reagent_containers/food/drinks/mug/rd(src)
/obj/structure/closet/secure_closet/research_reagents

3
code/game/objects/structures/crates_lockers/closets/secure/security.dm
View File

@@ -31,6 +31,7 @@
new /obj/item/weapon/storage/belt/rapier(src)
new /obj/item/weapon/gun/energy/gun(src)
new /obj/item/weapon/door_remote/captain(src)
new /obj/item/weapon/reagent_containers/food/drinks/mug/cap(src)
/obj/structure/closet/secure_closet/hop
@@ -56,6 +57,7 @@
new /obj/item/device/flash(src)
new /obj/item/clothing/accessory/petcollar(src)
new /obj/item/weapon/door_remote/civillian(src)
new /obj/item/weapon/reagent_containers/food/drinks/mug/hop(src)
/obj/structure/closet/secure_closet/hop2
@@ -120,6 +122,7 @@
new /obj/item/taperoll/police(src)
new /obj/item/weapon/gun/energy/gun/hos(src)
new /obj/item/weapon/door_remote/head_of_security(src)
new /obj/item/weapon/reagent_containers/food/drinks/mug/hos(src)
/obj/structure/closet/secure_closet/warden