cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-21 20:13:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into findnreplace

Browse Source
This commit is contained in:
Mark van Alphen
2017-03-08 10:37:10 +01:00
committed by GitHub
parent b0ded4b821 2c23ee82d8
commit b26d50d9f9
115 changed files with 996 additions and 1021 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
+8 -5
View File
@@ -87,11 +87,14 @@
icon_off = "fridge1"
req_access = list(access_heads_vault)
New()
..()
dispense_cash(6700, src)
/obj/structure/closet/secure_closet/freezer/money/New()
..()
for(var/i in 1 to 3)
new /obj/item/stack/spacecash/c1000(src)
for(var/i in 1 to 5)
new /obj/item/stack/spacecash/c500(src)
for(var/i in 1 to 6)
new /obj/item/stack/spacecash/c200(src)
code/game/objects/structures/crates_lockers/closets/syndicate.dm
+2 -2
View File
@@ -23,9 +23,9 @@
/obj/structure/closet/syndicate/suits/New()
..()
new /obj/item/clothing/head/helmet/space/rig/syndi(src)
new /obj/item/clothing/head/helmet/space/hardsuit/syndi(src)
new /obj/item/clothing/mask/gas/syndicate(src)
new /obj/item/clothing/suit/space/rig/syndi(src)
new /obj/item/clothing/suit/space/hardsuit/syndi(src)
new /obj/item/weapon/tank/jetpack/oxygen/harness(src)
/obj/structure/closet/syndicate/nuclear