mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-01-28 18:11:16 +00:00
5261efb67f
## About The Pull Request Melee attack chain now has a list passed along with it, `attack_modifiers`, which you can stick force modifiers to change the resulting attack This is basically a soft implementation of damage packets until a more definitive pr, but one that only applies to item attack chain, and not unarmed attacks. This change was done to facilitate a baton refactor - batons no longer hack together their own attack chain, and are now integrated straight into the real attack chain. This refactor itself was done because batons don't send any attack signals, which has been annoying in the past (for swing combat). ## Changelog 🆑 Melbert refactor: Batons have been refactored again. Baton stuns now properly count as an attack, when before it was a nothing. Report any oddities, particularly in regards to harmbatonning vs normal batonning. refactor: The method of adjusting item damage mid-attack has been refactored - some affected items include the Nullblade and knives. Report any strange happenings with damage numbers. refactor: A few objects have been moved to the new interaction chain - records consoles, mawed crucible, alien weeds and space vines, hedges, restaurant portals, and some mobs - to name a few. fix: Spears only deal bonus damage against secure lockers, not all closet types (including crates) /🆑
117 lines
4.0 KiB
Plaintext
117 lines
4.0 KiB
Plaintext
/obj/structure/urinal
|
|
name = "urinal"
|
|
desc = "The HU-452, an experimental urinal. Comes complete with experimental urinal cake."
|
|
icon = 'icons/obj/watercloset.dmi'
|
|
icon_state = "urinal"
|
|
density = FALSE
|
|
anchored = TRUE
|
|
/// Can you currently put an item inside
|
|
var/exposed = FALSE
|
|
/// What's in the urinal
|
|
var/obj/item/hidden_item
|
|
|
|
MAPPING_DIRECTIONAL_HELPERS(/obj/structure/urinal, 32)
|
|
|
|
/obj/structure/urinal/Initialize(mapload)
|
|
. = ..()
|
|
if(mapload)
|
|
hidden_item = new /obj/item/food/urinalcake(src)
|
|
find_and_hang_on_wall()
|
|
|
|
/obj/structure/urinal/Exited(atom/movable/gone, direction)
|
|
. = ..()
|
|
if(gone == hidden_item)
|
|
hidden_item = null
|
|
|
|
/obj/structure/urinal/attack_hand(mob/living/user, list/modifiers)
|
|
. = ..()
|
|
if(.)
|
|
return
|
|
|
|
if(user.pulling && isliving(user.pulling))
|
|
var/mob/living/grabbed_mob = user.pulling
|
|
if(user.grab_state >= GRAB_AGGRESSIVE)
|
|
if(grabbed_mob.loc != get_turf(src))
|
|
to_chat(user, span_notice("[grabbed_mob.name] needs to be on [src]."))
|
|
return
|
|
user.changeNext_move(CLICK_CD_MELEE)
|
|
user.visible_message(span_danger("[user] slams [grabbed_mob] into [src]!"), span_danger("You slam [grabbed_mob] into [src]!"))
|
|
grabbed_mob.emote("scream")
|
|
grabbed_mob.adjustBruteLoss(8)
|
|
else
|
|
to_chat(user, span_warning("You need a tighter grip!"))
|
|
return
|
|
|
|
if(exposed)
|
|
if(hidden_item)
|
|
to_chat(user, span_notice("You fish [hidden_item] out of the drain enclosure."))
|
|
user.put_in_hands(hidden_item)
|
|
else
|
|
to_chat(user, span_warning("There is nothing in the drain holder!"))
|
|
return
|
|
return ..()
|
|
|
|
/obj/structure/urinal/attackby(obj/item/attacking_item, mob/user, list/modifiers, list/attack_modifiers)
|
|
if(exposed)
|
|
if(hidden_item)
|
|
to_chat(user, span_warning("There is already something in the drain enclosure!"))
|
|
return
|
|
if(attacking_item.w_class > WEIGHT_CLASS_TINY)
|
|
to_chat(user, span_warning("[attacking_item] is too large for the drain enclosure."))
|
|
return
|
|
if(!user.transferItemToLoc(attacking_item, src))
|
|
to_chat(user, span_warning("[attacking_item] is stuck to your hand, you cannot put it in the drain enclosure!"))
|
|
return
|
|
hidden_item = attacking_item
|
|
to_chat(user, span_notice("You place [attacking_item] into the drain enclosure."))
|
|
return
|
|
return ..()
|
|
|
|
/obj/structure/urinal/screwdriver_act(mob/living/user, obj/item/I)
|
|
if(..())
|
|
return TRUE
|
|
to_chat(user, span_notice("You start to [exposed ? "screw the cap back into place" : "unscrew the cap to the drain protector"]..."))
|
|
playsound(loc, 'sound/effects/stonedoor_openclose.ogg', 50, TRUE)
|
|
if(I.use_tool(src, user, 20))
|
|
user.visible_message(span_notice("[user] [exposed ? "screws the cap back into place" : "unscrew the cap to the drain protector"]!"),
|
|
span_notice("You [exposed ? "screw the cap back into place" : "unscrew the cap on the drain"]!"),
|
|
span_hear("You hear metal and squishing noises."))
|
|
exposed = !exposed
|
|
return TRUE
|
|
|
|
/obj/structure/urinal/wrench_act_secondary(mob/living/user, obj/item/tool)
|
|
tool.play_tool_sound(user)
|
|
deconstruct(TRUE)
|
|
balloon_alert(user, "removed urinal")
|
|
return ITEM_INTERACT_SUCCESS
|
|
|
|
/obj/structure/urinal/atom_deconstruct(disassembled = TRUE)
|
|
new /obj/item/wallframe/urinal(loc)
|
|
hidden_item?.forceMove(drop_location())
|
|
|
|
/obj/item/wallframe/urinal
|
|
name = "urinal frame"
|
|
desc = "An unmounted urinal. Attach it to a wall to use."
|
|
icon = 'icons/obj/watercloset.dmi'
|
|
icon_state = "urinal"
|
|
result_path = /obj/structure/urinal
|
|
pixel_shift = 32
|
|
|
|
/obj/item/food/urinalcake
|
|
name = "urinal cake"
|
|
desc = "The noble urinal cake, protecting the station's pipes from the station's pee. Do not eat."
|
|
icon = 'icons/obj/watercloset.dmi'
|
|
icon_state = "urinalcake"
|
|
w_class = WEIGHT_CLASS_TINY
|
|
food_reagents = list(
|
|
/datum/reagent/chlorine = 3,
|
|
/datum/reagent/ammonia = 1,
|
|
)
|
|
foodtypes = TOXIC | GROSS
|
|
preserved_food = TRUE
|
|
|
|
/obj/item/food/urinalcake/attack_self(mob/living/user)
|
|
user.visible_message(span_notice("[user] squishes [src]!"), span_notice("You squish [src]."), "<i>You hear a squish.</i>")
|
|
icon_state = "urinalcake_squish"
|
|
addtimer(VARSET_CALLBACK(src, icon_state, "urinalcake"), 0.8 SECONDS)
|