cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-29 16:19:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

powder that makes you say yes

Browse Source
This commit is contained in:
Nadyr
2021-07-07 23:58:56 -04:00
committed by GitHub
parent 28c2ee46d3
commit 70fcf38987
1 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/ghost_pods/event_vr.dm
+1 -7
View File
@@ -52,15 +52,9 @@
"Webslinger Giant Spider" = /mob/living/simple_mob/animal/giant_spider/webslinger,
"Frost Giant Spider" = /mob/living/simple_mob/animal/giant_spider/frost,
"Nurse Giant Spider" = /mob/living/simple_mob/animal/giant_spider/nurse/eggless,
<<<<<<< HEAD
"Giant Spider Queen" = /mob/living/simple_mob/animal/giant_spider/nurse/queen/eggless,
"Weretiger" = /mob/living/simple_mob/vore/weretiger,
"Lesser Large Dragon" = /mob/living/simple_mob/vore/bigdragon/friendly/maintpred //CHOMPStation add.
||||||| parent of 37a522e7bf... Merge pull request #10948 from Ketrai/bigtig
"Giant Spider Queen" = /mob/living/simple_mob/animal/giant_spider/nurse/queen/eggless
=======
"Giant Spider Queen" = /mob/living/simple_mob/animal/giant_spider/nurse/queen/eggless,
"Weretiger" = /mob/living/simple_mob/vore/weretiger
>>>>>>> 37a522e7bf... Merge pull request #10948 from Ketrai/bigtig
)
/obj/structure/ghost_pod/ghost_activated/maintpred/create_occupant(var/mob/M)