Merge branch 'master' into updates_the_nbt

# Conflicts:
#	code/__defines/misc.dm
#	code/game/machinery/machinery.dm
#	maps/_common/mapsystem/map.dm
This commit is contained in:
alberyk
2022-02-19 10:26:35 -03:00
149 changed files with 2287 additions and 581 deletions
+1 -1
View File
@@ -25,7 +25,7 @@
var/mob/living/pulling
/obj/structure/janitorialcart/full/Initialize()
..()
. = ..()
mybag = new /obj/item/storage/bag/trash(src)
mymop = new /obj/item/mop(src)
myspray = new /obj/item/reagent_containers/spray/cleaner(src)
+2
View File
@@ -187,6 +187,8 @@
update_icon()
/obj/structure/railing/CheckExit(var/atom/movable/O, var/turf/target)
if(istype(O) && CanPass(O, target))
return TRUE
if(get_dir(O.loc, target) == dir)
if(!density)
return TRUE
@@ -358,7 +358,7 @@
slowdown = 0
/obj/structure/bed/roller/Initialize()
..()
. = ..()
LAZYADD(can_buckle, /obj/structure/closet/body_bag)
/obj/structure/bed/roller/Destroy()