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

missed conflict

Browse Source
This commit is contained in:
Raeschen
2023-07-05 10:14:43 +02:00
parent 3e0a0c0c98
commit 0e680b38a5
1 changed files with 0 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/crates_lockers/largecrate_vr.dm
-1
View File
@@ -74,7 +74,6 @@
/mob/living/simple_mob/animal/space/alien/queen,
// /mob/living/simple_mob/vore/otie/feral,
// /mob/living/simple_mob/vore/otie/red,
>>>>>>> c60995d1f4... Merge pull request #15106 from Very-Soft/tidying_and_tweaks
/mob/living/simple_mob/vore/aggressive/corrupthound))
return ..()