Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Collected the rest of zonespaces pages
Browse files Browse the repository at this point in the history
SpypigDev committed Jan 29, 2025
1 parent 2fb8f22 commit 7c0c6cc
Showing 5 changed files with 30 additions and 28 deletions.
9 changes: 7 additions & 2 deletions code/game/objects/items/bodybag.dm
Original file line number Diff line number Diff line change
@@ -171,18 +171,23 @@
return 1
return 0

// bodybags do nothing when called to dump contents
/obj/structure/closet/bodybag/dump_contents()

/obj/structure/closet/bodybag/open()
. = ..()
update_name()

/obj/structure/closet/bodybag/MouseDrop(over_object, src_location, over_location)
..()
if(over_object == usr && Adjacent(usr) && !roller_buckled)
if(!ishuman(usr)) return
if(!ishuman(usr))
return
var/obj/item/undeployed = locate(item_path) in contents
if(!(undeployed))
undeployed = new item_path(contents)
else if(length(contents) > 1) return 0
else if(length(contents) > 1)
return 0
visible_message(SPAN_NOTICE("[usr] folds up [name]."))
usr.put_in_hands(undeployed)
forceMove(undeployed)
19 changes: 9 additions & 10 deletions code/game/objects/structures/crates_lockers/closets.dm
Original file line number Diff line number Diff line change
@@ -77,9 +77,15 @@

/obj/structure/closet/proc/dump_contents()

if(!istype(src, /obj/structure/closet/bodybag)) // accounts for bodybag refactor
for(var/obj/I in src)
I.forceMove(loc)
for(var/obj/I in src)
I.forceMove(loc)

/obj/structure/closet/proc/open()
if(opened)
return 0

if(!can_open())
return 0

for(var/mob/M in src)
M.forceMove(loc)
@@ -91,13 +97,6 @@
M.visible_message(SPAN_WARNING("[M] suddenly gets out of [src]!"),
SPAN_WARNING("You get out of [src] and get your bearings!"))

/obj/structure/closet/proc/open()
if(opened)
return 0

if(!can_open())
return 0

dump_contents()

UnregisterSignal(src, COMSIG_CLOSET_FLASHBANGED)
18 changes: 10 additions & 8 deletions code/game/objects/structures/stool_bed_chair_nest/bed.dm
Original file line number Diff line number Diff line change
@@ -216,21 +216,21 @@
/obj/structure/bed/roller/MouseDrop(atom/over_object)
. = ..()
if(foldabletype && !buckled_mob && !buckled_bodybag)
var/mob/living/carbon/human/H = over_object
var/mob/living/carbon/human/user = over_object
if(length(contents) == 0)
new foldabletype(src)
var/obj/item/roller/rollerholder = locate(foldabletype) in src.contents
if (istype(over_object, /mob/living/carbon/human))
if (H == usr && !H.is_mob_incapacitated() && Adjacent(H) && in_range(src, over_object))
H.put_in_hands(rollerholder)
H.visible_message(SPAN_WARNING("[H] grabs [src] from the floor!"),
if (user == usr && !user.is_mob_incapacitated() && Adjacent(user) && in_range(src, over_object))
user.put_in_hands(rollerholder)
user.visible_message(SPAN_WARNING("[user] grabs [src] from the floor!"),
SPAN_WARNING("You grab [src] from the floor!"))
forceMove(rollerholder)

/obj/structure/bed/roller/buckle_mob(mob/M, mob/user)
if(iscarbon(M))
var/mob/living/carbon/C = M
if(C.handcuffed)
/obj/structure/bed/roller/buckle_mob(mob/mob, mob/user)
if(iscarbon(mob))
var/mob/living/carbon/target_mob = mob
if(target_mob.handcuffed)
to_chat(user, SPAN_DANGER("You cannot buckle someone who is handcuffed onto this bed."))
return
..()
@@ -268,6 +268,7 @@
..()
deploy_roller(user, user.loc)

/// Handles the switch between a item/roller to a structure/bed/roller, and storing one within the other when not in use
/obj/item/roller/proc/deploy_roller(mob/user, atom/location)
if(length(contents) == 0)
new rollertype(src)
@@ -328,6 +329,7 @@ GLOBAL_LIST_EMPTY(activated_medevac_stretchers)
accepts_bodybag = TRUE
var/stretcher_activated
var/view_range = 5
/// Allows Medevac beds to act like they're working, but not interact with the Medevac system itself. Set prop variable to TRUE when you'd like to bypass regular functions on a Medevac bed
var/prop
var/obj/structure/dropship_equipment/medevac_system/linked_medevac
surgery_duration_multiplier = SURGERY_SURFACE_MULT_AWFUL //On the one hand, it's a big stretcher. On the other hand, you have a big sheet covering the patient and those damned Fulton hookups everywhere.
7 changes: 2 additions & 5 deletions code/modules/mob/living/carbon/human/human_attackhand.dm
Original file line number Diff line number Diff line change
@@ -50,20 +50,17 @@
SPAN_HELPFUL("You <b>perform CPR</b> on <b>[src]</b>. Repeat at least every <b>7 seconds</b>."),
SPAN_NOTICE("<b>[attacking_mob]</b> performs <b>CPR</b> on <b>[src]</b>."))
if(is_revivable() && stat == DEAD)
var/successful
if(cpr_cooldown < world.time)
revive_grace_period += 7 SECONDS
attacking_mob.visible_message(SPAN_NOTICE("<b>[attacking_mob]</b> performs <b>CPR</b> on <b>[src]</b>."),
SPAN_HELPFUL("You perform <b>CPR</b> on <b>[src]</b>."))
balloon_alert(attacking_mob, "you perform cpr")
successful = TRUE
SEND_SIGNAL(attacking_mob, COMSIG_HUMAN_CPR_PERFORMED, successful)
SEND_SIGNAL(attacking_mob, COMSIG_HUMAN_CPR_PERFORMED, TRUE)
else
attacking_mob.visible_message(SPAN_NOTICE("<b>[attacking_mob]</b> fails to perform CPR on <b>[src]</b>."),
SPAN_HELPFUL("You <b>fail</b> to perform <b>CPR</b> on <b>[src]</b>. Incorrect rhythm. Do it <b>slower</b>."))
balloon_alert(attacking_mob, "incorrect rhythm. do it slower")
successful = FALSE
SEND_SIGNAL(attacking_mob, COMSIG_HUMAN_CPR_PERFORMED, successful)
SEND_SIGNAL(attacking_mob, COMSIG_HUMAN_CPR_PERFORMED, FALSE)
cpr_cooldown = world.time + 7 SECONDS
cpr_attempt_timer = 0
return 1
5 changes: 2 additions & 3 deletions code/modules/mob/living/living_health_procs.dm
Original file line number Diff line number Diff line change
@@ -567,11 +567,10 @@

// restore us to consciousness
set_stat(CONSCIOUS)
regenerate_all_icons()

SEND_SIGNAL(src, COMSIG_LIVING_REJUVENATED)

regenerate_all_icons()

/mob/living/proc/heal_all_damage()
// shut down various types of badness
heal_overall_damage(getBruteLoss(), getFireLoss())
@@ -601,8 +600,8 @@
/mob/living/proc/regenerate_all_icons()
// make the icons look correct
regenerate_icons()
med_hud_set_health()
med_hud_set_status()
med_hud_set_health()
med_hud_set_armor()
reload_fullscreens()
if(ishuman(src))

0 comments on commit 7c0c6cc

Please sign in to comment.