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

resolve it

Browse Source
This commit is contained in:
Seris02
2023-02-26 18:21:49 +08:00
parent d13fc550dc
commit c121d589c8
2 changed files with 1 additions and 220 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -753,18 +753,13 @@
/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
/obj/item/toy/plushie/borgplushie/drake/trauma)),
//VOREStation Add End
//YawnWider Add Start
/obj/item/toy/plushie/teshari/_yw,