cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ports some fixes

Browse Source
This commit is contained in:
Heroman
2019-04-07 14:02:34 +10:00
parent 4d2bff5b5c
commit 5a9e1f1566
4 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/__defines/_planes+layers.dm
View File

@@ -68,6 +68,7 @@ What is the naming convention for planes or layers?
// Obj planes // Obj planes
#define OBJ_PLANE -35 #define OBJ_PLANE -35
#define STAIRS_LAYER 2.5 // Layer for stairs
#define HIDING_LAYER 2.6 // Layer at which mobs hide to be under things like tables #define HIDING_LAYER 2.6 // Layer at which mobs hide to be under things like tables
#define DOOR_OPEN_LAYER 2.7 // Under all objects if opened. 2.7 due to tables being at 2.6 #define DOOR_OPEN_LAYER 2.7 // Under all objects if opened. 2.7 due to tables being at 2.6
#define TABLE_LAYER 2.8 // Just under stuff that wants to be slightly below common objects. #define TABLE_LAYER 2.8 // Just under stuff that wants to be slightly below common objects.

8
code/modules/food/kitchen/gibber.dm
View File

@@ -217,13 +217,13 @@
spawn(gib_time) spawn(gib_time)
src.operating = 0 operating = 0
src.occupant.gib() occupant.gib()
qdel(src.occupant) occupant = null
playsound(src.loc, 'sound/effects/splat.ogg', 50, 1) playsound(src.loc, 'sound/effects/splat.ogg', 50, 1)
operating = 0 operating = 0
for (var/obj/item/thing in contents) for (var/obj/thing in contents)
// There's a chance that the gibber will fail to destroy some evidence. // There's a chance that the gibber will fail to destroy some evidence.
if(istype(thing,/obj/item/organ) && prob(80)) if(istype(thing,/obj/item/organ) && prob(80))
qdel(thing) qdel(thing)

4
code/modules/multiz/movement.dm
View File

@@ -336,6 +336,10 @@
// Detect if we made a silent landing. // Detect if we made a silent landing.
if(locate(/obj/structure/stairs) in landing) if(locate(/obj/structure/stairs) in landing)
if(isliving(src))
var/mob/living/L = src
if(L.pulling)
L.pulling.forceMove(landing)
return 1 return 1
else else
var/atom/A = find_fall_target(oldloc, landing) var/atom/A = find_fall_target(oldloc, landing)

1
code/modules/multiz/structures.dm
View File

@@ -131,6 +131,7 @@
opacity = 0 opacity = 0
anchored = 1 anchored = 1
flags = ON_BORDER flags = ON_BORDER
layer = STAIRS_LAYER
/obj/structure/stairs/Initialize() /obj/structure/stairs/Initialize()
. = ..() . = ..()