mirror of
https://github.com/VOREStation/VOREStation.git
synced 2026-08-26 21:49:11 +01:00
Begin clickcode attack_self fix (#18797)
* Begin clickcode attack_self fix Begins the work to make everything call back to parent for attack_self so that signals are sacred. * Makes MORE things call the attack_self() parent Yes, I could make special_handling a var on obj/item HOWEVER i want it to be specific so it can be tracked down later and ONLY the objects that use it can be refactored instead of sitting there literally forever and it just becoming 'a thing'. * Finishes making the rest of attack_self call parent. As mentioned, things such as 'specialty_goggles' 'special_handling' and the such are only there to help with attack_self until the attack_self is recoded for those items. * begone foul demon * some more cleanup * These * GOD this was annoying * yeh * Fix this * fLARES * Thesee too * toys! * Even more! * More fixes * Even more * rest of em * these too * Update syndie.dm * hardref clear * Update code/game/gamemodes/nuclear/pinpointer.dm * Update code/game/objects/effects/mines.dm * Update code/game/objects/items/blueprints_vr.dm * Update code/game/objects/items/blueprints_vr.dm * Update code/game/objects/items/contraband_vr.dm * Update code/game/objects/items/crayons.dm * Update code/game/objects/items/crayons.dm * Update code/game/objects/items/gunbox.dm * Update code/game/objects/items/gunbox.dm * Update code/game/objects/items/gunbox_vr.dm * Update code/game/objects/items/gunbox_vr.dm * Update code/game/objects/items/weapons/gift_wrappaper.dm * Update code/game/objects/items/crayons.dm * Update code/game/objects/items/crayons.dm * Update code/game/objects/items/gunbox.dm * these too * Update maintpanel_stack.dm * angry warning * Fixes packaged snacks. Fixes improper var default. * Special handling for these * proper poly types * Fixes magclaws Makes the 'features' it had just part of base magboots that can be adjusted via varswap. * Fixes jackets Fixes https://github.com/VOREStation/VOREStation/issues/18941 * Small bugfix Makes p_Theyre properly capitialize Makes examine show proper wording * Update gift_wrappaper.dm
This commit is contained in:
@@ -53,8 +53,10 @@
|
||||
name = initial(name)
|
||||
|
||||
/obj/item/reagent_containers/chem_disp_cartridge/attack_self(mob/user)
|
||||
..()
|
||||
if (is_open_container())
|
||||
. = ..(user)
|
||||
if(.)
|
||||
return TRUE
|
||||
if(is_open_container())
|
||||
to_chat(user, span_notice("You put the cap on \the [src]."))
|
||||
flags ^= OPENCONTAINER
|
||||
else
|
||||
|
||||
@@ -34,9 +34,6 @@
|
||||
WARNING("[src]([src.type]) starts with more reagents than it has total volume")
|
||||
starts_with = null // it should gc, since it's just strings and numbers
|
||||
|
||||
/obj/item/reagent_containers/attack_self(mob/user as mob)
|
||||
return
|
||||
|
||||
/obj/item/reagent_containers/afterattack(obj/target, mob/user, flag)
|
||||
return
|
||||
|
||||
|
||||
@@ -1,4 +1,7 @@
|
||||
/obj/item/reagent_containers/blood/attack_self(mob/living/user as mob)
|
||||
/obj/item/reagent_containers/blood/attack_self(mob/living/user)
|
||||
. = ..(user)
|
||||
if(.)
|
||||
return TRUE
|
||||
if(user.a_intent == I_HURT)
|
||||
if(reagents.total_volume && volume)
|
||||
var/remove_volume = volume* 0.1 //10% of what the bloodpack can hold.
|
||||
|
||||
@@ -181,7 +181,10 @@
|
||||
balloon_alert(M, "you feel a tiny prick!")
|
||||
return
|
||||
|
||||
/obj/item/reagent_containers/borghypo/attack_self(mob/user as mob) //Change the mode
|
||||
/obj/item/reagent_containers/borghypo/attack_self(mob/user) //Change the mode
|
||||
. = ..(user)
|
||||
if(.)
|
||||
return TRUE
|
||||
tgui_interact(user)
|
||||
return
|
||||
|
||||
|
||||
@@ -52,6 +52,9 @@
|
||||
/obj/machinery/computer/pandemic
|
||||
)
|
||||
|
||||
///Var for attack_self chain
|
||||
var/special_handling = FALSE
|
||||
|
||||
/obj/item/reagent_containers/glass/Initialize(mapload)
|
||||
. = ..()
|
||||
if(LAZYLEN(prefill))
|
||||
@@ -73,7 +76,11 @@
|
||||
. += span_notice("Airtight lid seals it completely.")
|
||||
|
||||
/obj/item/reagent_containers/glass/attack_self(mob/user)
|
||||
..()
|
||||
. = ..(user)
|
||||
if(.)
|
||||
return TRUE
|
||||
if(special_handling)
|
||||
return FALSE
|
||||
if(is_open_container())
|
||||
balloon_alert(user, "lid put on \the [src]")
|
||||
flags ^= OPENCONTAINER
|
||||
|
||||
@@ -69,7 +69,7 @@
|
||||
return
|
||||
|
||||
/*
|
||||
/obj/item/reagent_containers/spray/attack_self(var/mob/user) //Now done via alt-click instead
|
||||
/obj/item/reagent_containers/spray/attack_self(mob/user) //Now done via alt-click instead
|
||||
if(!max_transfer_amount)
|
||||
return
|
||||
amount_per_transfer_from_this = next_in_list(amount_per_transfer_from_this, possible_transfer_amounts)
|
||||
@@ -137,7 +137,10 @@
|
||||
if(Adjacent(user))
|
||||
. += "The safety is [safety ? "on" : "off"]."
|
||||
|
||||
/obj/item/reagent_containers/spray/pepper/attack_self(var/mob/user)
|
||||
/obj/item/reagent_containers/spray/pepper/attack_self(mob/user)
|
||||
. = ..(user)
|
||||
if(.)
|
||||
return TRUE
|
||||
safety = !safety
|
||||
balloon_alert(user, "safety [safety ? "on" : "off"].")
|
||||
|
||||
|
||||
@@ -63,7 +63,10 @@
|
||||
..()
|
||||
update_icon()
|
||||
|
||||
/obj/item/reagent_containers/syringe/attack_self(mob/user as mob)
|
||||
/obj/item/reagent_containers/syringe/attack_self(mob/user)
|
||||
. = ..(user)
|
||||
if(.)
|
||||
return TRUE
|
||||
switch(mode)
|
||||
if(SYRINGE_CAPPED)
|
||||
mode = SYRINGE_DRAW
|
||||
|
||||
Reference in New Issue
Block a user