cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

adds more drake plushies, and changes scidrake lights to match sci colors

Browse Source
This commit is contained in:
Heroman3003
2023-02-26 19:45:15 +10:00
committed by CHOMPStation2
parent e966a01446
commit d13fc550dc
7 changed files with 271 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
code/game/objects/random/misc.dm
View File

@@ -753,8 +753,18 @@
/obj/item/toy/plushie/nukeplushie,
/obj/item/toy/plushie/otter,
/obj/item/toy/plushie/vox,
<<<<<<< HEAD
/obj/item/toy/plushie/borgplushie/drakiesec,
/obj/item/toy/plushie/borgplushie/drakiemed,
=======
pick(list(/obj/item/toy/plushie/borgplushie/drake/sec,
/obj/item/toy/plushie/borgplushie/drake/med,
/obj/item/toy/plushie/borgplushie/drake/sci,
/obj/item/toy/plushie/borgplushie/drake/jani,
/obj/item/toy/plushie/borgplushie/drake/eng,
/obj/item/toy/plushie/borgplushie/drake/mine,
/obj/item/toy/plushie/borgplushie/drake/trauma)))
>>>>>>> 922b787c46... Merge pull request #14568 from Seris02/janidrakeplush
//VOREStation Add End
//YawnWider Add Start
/obj/item/toy/plushie/teshari/_yw,