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

Merge branch 'master' into shep-dev-aurora-cooking-port

Browse Source
This commit is contained in:
Rykka
2020-07-28 04:04:39 -04:00
parent a42d3d12c0 fd435e8e0f
commit 831ba82b7a
67 changed files with 1251 additions and 452 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
@@ -53,6 +53,7 @@
/mob/living/simple_mob/vore/aggressive/mimic,
/mob/living/simple_mob/vore/aggressive/rat,
/mob/living/simple_mob/vore/aggressive/rat/tame,
/mob/living/simple_mob/otie/zorgoia, //CHOMPstation edit
// /mob/living/simple_mob/otie;0.5
))
return ..()
code/game/objects/structures/morgue.dm
+1 -1
View File
@@ -344,7 +344,7 @@ GLOBAL_LIST_BOILERPLATE(all_crematoriums, /obj/structure/morgue/crematorium)
if(..())
return
if(src.allowed(user))
for (var/obj/structure/morgue/crematorium/C in all_crematoriums)
for (var/obj/structure/morgue/crematorium/C in GLOB.all_crematoriums)
if (C.id == id)
if (!C.cremating)
C.cremate(user)