cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-22 04:37:45 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update misc.dm

Browse Source
This commit is contained in:
Nadyr
2021-01-03 21:38:36 -05:00
committed by GitHub
parent 452a493f82
commit cdc8abcbb9
1 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/random/misc.dm
+1 -7
View File
@@ -673,14 +673,8 @@
/obj/item/toy/plushie/borgplushie/scrubpuppy,
/obj/item/toy/plushie/foxbear,
/obj/item/toy/plushie/nukeplushie,
<<<<<<< HEAD
/obj/item/toy/plushie/otter,
||||||| parent of f98b1e125e... Merge pull request #9520 from Novacat/nova-basicfixes
/obj/item/toy/plushie/otter)
=======
/obj/item/toy/plushie/otter,
/obj/item/toy/plushie/vox)
>>>>>>> f98b1e125e... Merge pull request #9520 from Novacat/nova-basicfixes
/obj/item/toy/plushie/vox,
//VOREStation Add End
//YawnWider Add Start
/obj/item/toy/plushie/teshari/_yw,