cyberpresidentvanellope/vgstation13
1
0
Fork 0
mirror of https://github.com/vgstation-coders/vgstation13.git synced 2025-12-10 10:21:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

crateshelf fixes (#37214)

Browse Source
This commit is contained in:
west3436
2024-10-02 09:16:40 -04:00
committed by GitHub
parent 8885701217
commit ef42e21adf
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
code/game/objects/structures/crateshelf.dm
View File

@@ -20,6 +20,9 @@
var/use_delay = DEFAULT_SHELF_USE_DELAY var/use_delay = DEFAULT_SHELF_USE_DELAY
var/list/shelf_contents var/list/shelf_contents
var/osha_violation = FALSE // Have the screws been loosened by a DEVIOUS FIEND var/osha_violation = FALSE // Have the screws been loosened by a DEVIOUS FIEND
var/damage_amount= 25 //for badminnery
var/made_in_china = FALSE //gibs if true
var/collapsed = FALSE
/obj/structure/rack/crate_shelf/tall /obj/structure/rack/crate_shelf/tall
capacity = 12 capacity = 12
@@ -78,7 +81,7 @@
visible_message("[user] [osha_violation?"loosens":"tightens"] \the [src]'s bolts.", "You [osha_violation?"loosen":"tighten"] \the [src]'s bolts.") visible_message("[user] [osha_violation?"loosens":"tightens"] \the [src]'s bolts.", "You [osha_violation?"loosen":"tighten"] \the [src]'s bolts.")
/obj/structure/rack/crate_shelf/attack_hand(mob/living/user) /obj/structure/rack/crate_shelf/attack_hand(mob/living/user)
if(trapping) if(collapsed)
visible_message("[user] begins clearing \the [src] debris.", "You begins clearing \the [src] debris.") visible_message("[user] begins clearing \the [src] debris.", "You begins clearing \the [src] debris.")
if(do_after(user,src,5 SECONDS)) if(do_after(user,src,5 SECONDS))
visible_message("[user] clears \the [src] debris.", "You clear \the [src] debris.") visible_message("[user] clears \the [src] debris.", "You clear \the [src] debris.")
@@ -230,6 +233,8 @@
//4: Bombed //4: Bombed
//Loosening the bolts with a screwdriver doubles power //Loosening the bolts with a screwdriver doubles power
/obj/structure/rack/crate_shelf/proc/wobble(var/power,var/atom/movable/wobbler = null) /obj/structure/rack/crate_shelf/proc/wobble(var/power,var/atom/movable/wobbler = null)
if(collapsed) //it won't fall on you if it already fell over
return
var/wobble_roll = power * 25 * (osha_violation?2:1) var/wobble_roll = power * 25 * (osha_violation?2:1)
var/wobble_amount = floor(clamp(rand(1,wobble_roll),0,100)/5) var/wobble_amount = floor(clamp(rand(1,wobble_roll),0,100)/5)
var/wobble_dir var/wobble_dir
@@ -278,6 +283,7 @@
flags = LOCKED_SHOULD_LIE flags = LOCKED_SHOULD_LIE
/obj/structure/rack/crate_shelf/proc/post2liveleak(var/tipdir) /obj/structure/rack/crate_shelf/proc/post2liveleak(var/tipdir)
collapsed = TRUE
var/turf/fallturf = get_turf(get_step(src,tipdir)) var/turf/fallturf = get_turf(get_step(src,tipdir))
if(fallturf.density) //fall in the opposite direction if there's a wall in the way if(fallturf.density) //fall in the opposite direction if there's a wall in the way
fallturf = get_turf(get_step(src,opposite_dirs[tipdir])) fallturf = get_turf(get_step(src,opposite_dirs[tipdir]))
@@ -299,8 +305,12 @@
if(crate.open()) if(crate.open())
crate.visible_message("<span class='warning'>[crate]'s lid falls open!</span>") crate.visible_message("<span class='warning'>[crate]'s lid falls open!</span>")
shelf_contents[shelf_contents.Find(crate)] = null shelf_contents[shelf_contents.Find(crate)] = null
handle_visuals()
for(var/mob/living/carbon/human/H in fallturf) for(var/mob/living/carbon/human/H in fallturf)
if(made_in_china)
H.gib()
return
var/datum/organ/external/injuredorgan = H.pick_usable_organ(LIMB_HEAD,LIMB_CHEST,LIMB_GROIN,LIMB_LEFT_ARM, var/datum/organ/external/injuredorgan = H.pick_usable_organ(LIMB_HEAD,LIMB_CHEST,LIMB_GROIN,LIMB_LEFT_ARM,
LIMB_RIGHT_ARM,LIMB_LEFT_HAND,LIMB_RIGHT_HAND,LIMB_LEFT_LEG, LIMB_RIGHT_ARM,LIMB_LEFT_HAND,LIMB_RIGHT_HAND,LIMB_LEFT_LEG,
LIMB_RIGHT_LEG,LIMB_LEFT_FOOT,LIMB_RIGHT_FOOT) LIMB_RIGHT_LEG,LIMB_LEFT_FOOT,LIMB_RIGHT_FOOT)
@@ -310,7 +320,7 @@
"<span class='warning'>Something heavy fell and pinned you to the floor!</span>") "<span class='warning'>Something heavy fell and pinned you to the floor!</span>")
lock_atom(H, /datum/locking_category/shelf) lock_atom(H, /datum/locking_category/shelf)
if(injuredorgan?.take_damage(15, 0, 25, SERRATED_BLADE & SHARP_BLADE)) if(injuredorgan?.take_damage(damage_amount - 10, 0, damage_amount, SERRATED_BLADE & SHARP_BLADE))
H.UpdateDamageIcon() H.UpdateDamageIcon()
H.updatehealth() H.updatehealth()