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

Update misc.dm

Browse Source
This commit is contained in:
Nadyr
2021-01-07 22:24:37 -05:00
committed by GitHub
parent 601c842d13
commit ca1eedb24e
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/random/misc.dm
-6
View File
@@ -674,15 +674,9 @@
/obj/item/toy/plushie/foxbear,
/obj/item/toy/plushie/nukeplushie,
/obj/item/toy/plushie/otter,
<<<<<<< HEAD
/obj/item/toy/plushie/vox,
||||||| parent of c4f471ff0e... Merge pull request #9541 from SarmentiCampbell/drakeborg
/obj/item/toy/plushie/vox)
=======
/obj/item/toy/plushie/vox,
/obj/item/toy/plushie/borgplushie/drakiesec,
/obj/item/toy/plushie/borgplushie/drakiemed)
>>>>>>> c4f471ff0e... Merge pull request #9541 from SarmentiCampbell/drakeborg
//VOREStation Add End
//YawnWider Add Start
/obj/item/toy/plushie/teshari/_yw,