cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-27 15:18:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into kk-fixes2

Browse Source
This commit is contained in:
Izac Joof Forsgren
2020-04-26 04:42:47 +02:00
committed by GitHub
parent 0100fc24c9 e6d804da27
commit faf7206ec8
3 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/supplypacks/recreation_yw.dm
+7
View File
@@ -14,3 +14,10 @@
cost = 100
containertype = /obj/structure/closet/crate
containername = "Instrument crate"
/datum/supply_pack/recreation/piano
name = "Grand* Piano"
contains = list()
cost = 150
containertype = /obj/structure/largecrate/piano
containername = "Piano Crate"
code/game/objects/structures/crates_lockers/largecrate_yw.dm
+9
View File
@@ -0,0 +1,9 @@
/obj/structure/largecrate/piano
name = "piano crate"
starts_with = list(/obj/structure/device/piano)
desc = "*Grand piano may end up being a minimoog."
/obj/structure/largecrate/piano/Initialize() //This is nessesary to get a random one each time.
starts_with = list(pick(/obj/structure/device/piano/minimoog,
/obj/structure/device/piano))
return ..()
vorestation.dme
+1
View File
@@ -1406,6 +1406,7 @@
#include "code\game\objects\structures\crates_lockers\crates_vr.dm"
#include "code\game\objects\structures\crates_lockers\largecrate.dm"
#include "code\game\objects\structures\crates_lockers\largecrate_vr.dm"
#include "code\game\objects\structures\crates_lockers\largecrate_yw.dm"
#include "code\game\objects\structures\crates_lockers\vehiclecage.dm"
#include "code\game\objects\structures\crates_lockers\closets\coffin.dm"
#include "code\game\objects\structures\crates_lockers\closets\crittercrate.dm"