mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-20 03:19:58 +01:00
Merge branch 'master' into placeholder
This commit is contained in:
@@ -118,6 +118,7 @@
|
||||
new /obj/item/storage/box/inhalers(src)
|
||||
new /obj/item/clothing/glasses/hud/health/aviator(src)
|
||||
new /obj/item/storage/box/fancy/keypouch/med(src)
|
||||
new /obj/item/device/advanced_healthanalyzer(src)
|
||||
|
||||
/obj/structure/closet/secure_closet/CMO2
|
||||
name = "chief medical officer's attire"
|
||||
|
||||
@@ -82,6 +82,11 @@
|
||||
desc += padding_material ? " It's made of [material.use_name] and covered with [padding_material.use_name]." : " It's made of [material.use_name]."
|
||||
|
||||
|
||||
/obj/structure/bed/forceMove(atom/dest)
|
||||
. = ..()
|
||||
if(buckled_mob)
|
||||
buckled_mob.forceMove(dest)
|
||||
|
||||
/obj/structure/bed/CanPass(atom/movable/mover, turf/target, height=0, air_group=0)
|
||||
if(istype(mover) && mover.checkpass(PASSTABLE))
|
||||
return 1
|
||||
|
||||
Reference in New Issue
Block a user