cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 19:22:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3880 from Verkister/vsedits

Browse Source 
Couple VS edit fixes.
This commit is contained in:
Aronai Sieyes
2018-06-15 09:12:30 -04:00
committed by GitHub
parent 049ea78975 ac94d82ba1
commit c81757bcf9
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/game/machinery/cryopod.dm
View File

@@ -362,6 +362,8 @@
qdel(R.mmi) qdel(R.mmi)
for(var/obj/item/I in R.module) // the tools the borg has; metal, glass, guns etc for(var/obj/item/I in R.module) // the tools the borg has; metal, glass, guns etc
for(var/mob/M in I) //VOREStation edit
despawn_occupant(M)
for(var/obj/item/O in I) // the things inside the tools, if anything; mainly for janiborg trash bags for(var/obj/item/O in I) // the things inside the tools, if anything; mainly for janiborg trash bags
O.forceMove(R) O.forceMove(R)
qdel(I) qdel(I)

4
code/modules/mob/living/simple_animal/aliens/mimic.dm
View File

@@ -114,6 +114,8 @@
var/obj/structure/closet/crate/C = new(get_turf(src)) var/obj/structure/closet/crate/C = new(get_turf(src))
// Put loot in crate // Put loot in crate
for(var/obj/O in src) for(var/obj/O in src)
if(isbelly(O)) //VOREStation edit
continue
O.forceMove(C) O.forceMove(C)
..() ..()
@@ -146,6 +148,8 @@ var/global/list/protected_objects = list(/obj/structure/table, /obj/structure/ca
/mob/living/simple_animal/hostile/mimic/copy/death() /mob/living/simple_animal/hostile/mimic/copy/death()
for(var/atom/movable/M in src) for(var/atom/movable/M in src)
if(isbelly(M)) //VOREStation edit
continue
M.forceMove(get_turf(src)) M.forceMove(get_turf(src))
..() ..()