mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-01-29 18:40:42 +00:00
339616ae78
## About The Pull Request People can now pet held mothroaches and pugs if they want to, or use items on them, hopefully without causing many issues. After all, it only took about a couple dozen lines of code to make... ...Oh, did the 527 files changed or the 850~ lines added/removed perhaps catch your eye? Made you wonder if I accidentally pushed the wrong branch? or skewed something up big time? Well, nuh uh. I just happen to be fed up with the melee attack chain still using stringized params instead of an array/list. It was frankly revolting to see how I'd have had to otherwise call `list2params` for what I'm trying to accomplish here, and make this PR another tessera to the immense stupidity of our attack chain procs calling `params2list` over and over and over instead of just using that one call instance from `ClickOn` as an argument. It's 2025, honey, wake up! I also tried to replace some of those single letter vars/args but there are just way too many of them. ## Why It's Good For The Game Improving old code. And I want to be able to pet mobroaches while holding them too. ## Changelog 🆑 qol: You can now interact with held mobs in more ways beside wearing them. /🆑
171 lines
5.9 KiB
Plaintext
171 lines
5.9 KiB
Plaintext
#define MEATSPIKE_IRONROD_REQUIREMENT 4
|
|
|
|
/obj/structure/kitchenspike_frame
|
|
name = "meatspike frame"
|
|
icon = 'icons/obj/service/kitchen.dmi'
|
|
icon_state = "spikeframe"
|
|
desc = "The frame of a meat spike."
|
|
density = TRUE
|
|
anchored = FALSE
|
|
max_integrity = 200
|
|
|
|
/obj/structure/kitchenspike_frame/Initialize(mapload)
|
|
. = ..()
|
|
register_context()
|
|
|
|
/obj/structure/kitchenspike_frame/examine(mob/user)
|
|
. = ..()
|
|
. += "It can be <b>welded</b> apart."
|
|
. += "You could attach <b>[MEATSPIKE_IRONROD_REQUIREMENT]</b> iron rods to it to create a <b>Meat Spike</b>."
|
|
|
|
/obj/structure/kitchenspike_frame/add_context(atom/source, list/context, obj/item/held_item, mob/living/user)
|
|
if(isnull(held_item))
|
|
return NONE
|
|
|
|
var/message = ""
|
|
if(held_item.tool_behaviour == TOOL_WELDER)
|
|
message = "Deconstruct"
|
|
else if(held_item.tool_behaviour == TOOL_WRENCH)
|
|
message = "Bolt Down Frame"
|
|
|
|
if(!message)
|
|
return NONE
|
|
context[SCREENTIP_CONTEXT_LMB] = message
|
|
return CONTEXTUAL_SCREENTIP_SET
|
|
|
|
/obj/structure/kitchenspike_frame/welder_act(mob/living/user, obj/item/tool)
|
|
if(!tool.tool_start_check(user, amount = 0, heat_required = HIGH_TEMPERATURE_REQUIRED))
|
|
return FALSE
|
|
to_chat(user, span_notice("You begin cutting \the [src] apart..."))
|
|
if(!tool.use_tool(src, user, 5 SECONDS, volume = 50))
|
|
return TRUE
|
|
visible_message(span_notice("[user] slices apart \the [src]."),
|
|
span_notice("You cut \the [src] apart with \the [tool]."),
|
|
span_hear("You hear welding."))
|
|
new /obj/item/stack/sheet/iron(loc, MEATSPIKE_IRONROD_REQUIREMENT)
|
|
qdel(src)
|
|
return TRUE
|
|
|
|
/obj/structure/kitchenspike_frame/wrench_act(mob/living/user, obj/item/tool)
|
|
default_unfasten_wrench(user, tool)
|
|
return TRUE
|
|
|
|
/obj/structure/kitchenspike_frame/attackby(obj/item/attacking_item, mob/user, list/modifiers)
|
|
add_fingerprint(user)
|
|
if(!istype(attacking_item, /obj/item/stack/rods))
|
|
return ..()
|
|
var/obj/item/stack/rods/used_rods = attacking_item
|
|
if(used_rods.get_amount() >= MEATSPIKE_IRONROD_REQUIREMENT)
|
|
used_rods.use(MEATSPIKE_IRONROD_REQUIREMENT)
|
|
balloon_alert(user, "meatspike built")
|
|
var/obj/structure/new_meatspike = new /obj/structure/kitchenspike(loc)
|
|
transfer_fingerprints_to(new_meatspike)
|
|
qdel(src)
|
|
return
|
|
balloon_alert(user, "[MEATSPIKE_IRONROD_REQUIREMENT] rods needed!")
|
|
|
|
/obj/structure/kitchenspike
|
|
name = "meat spike"
|
|
icon = 'icons/obj/service/kitchen.dmi'
|
|
icon_state = "spike"
|
|
desc = "A spike for collecting meat from animals."
|
|
density = TRUE
|
|
anchored = TRUE
|
|
buckle_lying = FALSE
|
|
can_buckle = TRUE
|
|
max_integrity = 250
|
|
|
|
/obj/structure/kitchenspike/Initialize(mapload)
|
|
. = ..()
|
|
register_context()
|
|
|
|
/obj/structure/kitchenspike/examine(mob/user)
|
|
. = ..()
|
|
. += "<b>Drag a mob</b> onto it to hook it in place."
|
|
. += "A <b>crowbar</b> could remove those spikes."
|
|
|
|
/obj/structure/kitchenspike/add_context(atom/source, list/context, obj/item/held_item, mob/living/user)
|
|
if(isnull(held_item))
|
|
return NONE
|
|
|
|
if(held_item.tool_behaviour == TOOL_CROWBAR)
|
|
context[SCREENTIP_CONTEXT_LMB] = "Remove Spikes"
|
|
return CONTEXTUAL_SCREENTIP_SET
|
|
|
|
return NONE
|
|
|
|
/obj/structure/kitchenspike/attack_paw(mob/user, list/modifiers)
|
|
return attack_hand(user, modifiers)
|
|
|
|
/obj/structure/kitchenspike/crowbar_act(mob/living/user, obj/item/tool)
|
|
if(has_buckled_mobs())
|
|
to_chat(user, span_warning("You can't do that while something's on the spike!"))
|
|
return TRUE
|
|
|
|
if(tool.use_tool(src, user, 2 SECONDS, volume = 100))
|
|
to_chat(user, span_notice("You pry the spikes out of the frame."))
|
|
deconstruct(TRUE)
|
|
return TRUE
|
|
return FALSE
|
|
|
|
/obj/structure/kitchenspike/user_buckle_mob(mob/living/target, mob/user, check_loc = TRUE)
|
|
if(!iscarbon(target) && !isanimal_or_basicmob(target))
|
|
return
|
|
if(!do_after(user, 10 SECONDS, target))
|
|
return
|
|
return ..()
|
|
|
|
/obj/structure/kitchenspike/post_buckle_mob(mob/living/target)
|
|
playsound(src.loc, 'sound/effects/splat.ogg', 25, TRUE)
|
|
target.emote("scream")
|
|
target.add_splatter_floor()
|
|
target.adjustBruteLoss(30)
|
|
target.setDir(2)
|
|
var/matrix/m180 = matrix(target.transform)
|
|
m180.Turn(180)
|
|
animate(target, transform = m180, time = 3)
|
|
target.add_offsets(type, y_add = -6, animate = FALSE)
|
|
ADD_TRAIT(target, TRAIT_MOVE_UPSIDE_DOWN, REF(src))
|
|
|
|
/obj/structure/kitchenspike/user_unbuckle_mob(mob/living/buckled_mob, mob/user)
|
|
if(buckled_mob != user)
|
|
buckled_mob.visible_message(span_notice("[user] tries to pull [buckled_mob] free of [src]!"),\
|
|
span_notice("[user] is trying to pull you off [src], opening up fresh wounds!"),\
|
|
span_hear("You hear a squishy wet noise."))
|
|
if(!do_after(user, 30 SECONDS, target = src))
|
|
if(buckled_mob?.buckled)
|
|
buckled_mob.visible_message(span_notice("[user] fails to free [buckled_mob]!"),\
|
|
span_notice("[user] fails to pull you off of [src]."))
|
|
return
|
|
|
|
else
|
|
buckled_mob.visible_message(span_warning("[buckled_mob] struggles to break free from [src]!"),\
|
|
span_notice("You struggle to break free from [src], exacerbating your wounds! (Stay still for two minutes.)"),\
|
|
span_hear("You hear a wet squishing noise.."))
|
|
buckled_mob.adjustBruteLoss(30)
|
|
if(!do_after(buckled_mob, 2 MINUTES, target = src, hidden = TRUE))
|
|
if(buckled_mob?.buckled)
|
|
to_chat(buckled_mob, span_warning("You fail to free yourself!"))
|
|
return
|
|
return ..()
|
|
|
|
/obj/structure/kitchenspike/post_unbuckle_mob(mob/living/buckled_mob)
|
|
buckled_mob.adjustBruteLoss(30)
|
|
INVOKE_ASYNC(buckled_mob, TYPE_PROC_REF(/mob, emote), "scream")
|
|
buckled_mob.AdjustParalyzed(20)
|
|
var/matrix/m180 = matrix(buckled_mob.transform)
|
|
m180.Turn(180)
|
|
animate(buckled_mob, transform = m180, time = 3)
|
|
buckled_mob.remove_offsets(type, animate = FALSE)
|
|
REMOVE_TRAIT(buckled_mob, TRAIT_MOVE_UPSIDE_DOWN, REF(src))
|
|
|
|
/obj/structure/kitchenspike/atom_deconstruct(disassembled = TRUE)
|
|
if(disassembled)
|
|
var/obj/structure/meatspike_frame = new /obj/structure/kitchenspike_frame(src.loc)
|
|
transfer_fingerprints_to(meatspike_frame)
|
|
else
|
|
new /obj/item/stack/sheet/iron(src.loc, 4)
|
|
new /obj/item/stack/rods(loc, MEATSPIKE_IRONROD_REQUIREMENT)
|
|
|
|
#undef MEATSPIKE_IRONROD_REQUIREMENT
|