cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-29 23:17:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Begin clickcode attack_self fix (#18797)

Browse Source 
* 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:
Cameron Lennox
2025-12-29 13:21:10 -05:00
committed by GitHub
parent b770d9fa54
commit d5849910e5
350 changed files with 2603 additions and 969 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/vore/fluffstuff/custom_clothes_vr.dm
+8 -3
View File
@@ -669,6 +669,7 @@
light_system = MOVABLE_LIGHT
actions_types = list(/datum/action/item_action/toggle_pom_pom)
special_handling = TRUE
/obj/item/clothing/head/fluff/pompom/digest_act(var/atom/movable/item_storage = null)
return FALSE
@@ -677,6 +678,9 @@
return FALSE
/obj/item/clothing/head/fluff/pompom/attack_self(mob/user)
. = ..(user)
if(.)
return TRUE
//if(!isturf(user.loc)) -- doesn't seem to cause problems to allow this and it's silly not to
// to_chat(user, "You cannot turn the light on while in this [user.loc]")
// return
@@ -1254,12 +1258,10 @@ Departamental Swimsuits, for general use
if(unbuttoned)
icon_state = "[initial(icon_state)]"
item_state = "[initial(item_state)]"
unbuttoned = FALSE
to_chat(usr, "You button up the coat.")
else
icon_state = "[initial(icon_state)]_open"
item_state = "[initial(item_state)]_open"
unbuttoned = TRUE
to_chat(usr, "You unbutton the coat.")
usr.update_inv_wear_suit()
@@ -1933,7 +1935,10 @@ Departamental Swimsuits, for general use
translocator_unequip(translocator, user)
/obj/item/clothing/head/fluff/nikki/attack_self(mob/user)
..()
. = ..(user)
if(.)
return TRUE
..(user, TRUE)
if (translocator)
translocator.attack_self(user, user)
return
code/modules/vore/fluffstuff/custom_items_vr.dm
+46 -12
View File
@@ -220,9 +220,13 @@
icon_state = "joanbadge"
registered_name = "Joan Risu"
assignment = "Centcom Officer"
special_handling = TRUE
/obj/item/card/id/centcom/station/fluff/joanbadge/attack_self(mob/user as mob)
/obj/item/card/id/centcom/station/fluff/joanbadge/attack_self(mob/user)
. = ..(user)
if(.)
return TRUE
if(isliving(user))
user.visible_message(span_warning("[user] flashes their golden security badge.\nIt reads:NT Security."),span_warning("You display the faded badge.\nIt reads: NT Security."))
@@ -290,7 +294,10 @@
icon_override = 'icons/vore/custom_items_vr.dmi'
item_state = "Flag_Nanotrasen_mob"
/obj/item/flag/attack_self(mob/user as mob)
/obj/item/flag/attack_self(mob/user)
. = ..(user)
if(.)
return TRUE
if(isliving(user))
user.visible_message(span_warning("[user] waves their Banner around!"),span_warning("You wave your Banner around."))
@@ -411,16 +418,19 @@
/obj/item/card/id/centcom/station/fluff/aronai
registered_name = "CONFIGURE ME"
assignment = "CC Medical"
var/configured = 0
can_configure = TRUE
/obj/item/card/id/centcom/station/fluff/aronai/attack_self(mob/user as mob)
/obj/item/card/id/centcom/station/fluff/aronai/attack_self(mob/user)
. = ..(user)
if(.)
return TRUE
if(configured)
return ..()
return
user.set_id_info(src)
if(user.mind && user.mind.initial_account)
associated_account_number = user.mind.initial_account.account_number
configured = 1
configured = TRUE
to_chat(user, span_notice("Card settings set."))
//Swat43:Fortune Bloise
@@ -543,6 +553,7 @@
var/mob/owner = null
var/client/owner_c = null //They'll be dead when we message them probably.
var/state = 0 //0 - New, 1 - Paired, 2 - Breaking, 3 - Broken (same as iconstates)
special_collar = TRUE
/obj/item/clothing/accessory/collar/khcrystal/Initialize(mapload)
. = ..()
@@ -558,7 +569,10 @@
if((state > 1) || !owner)
STOP_PROCESSING(SSobj, src)
/obj/item/clothing/accessory/collar/khcrystal/attack_self(mob/user as mob)
/obj/item/clothing/accessory/collar/khcrystal/attack_self(mob/user)
. = ..(user)
if(.)
return TRUE
if(state > 0) //Can't re-pair, one time only, for security reasons.
to_chat(user, span_notice("The [name] doesn't do anything."))
return 0
@@ -771,7 +785,10 @@
icon_state = "dragor_dot"
w_class = ITEMSIZE_SMALL
/obj/item/fluff/dragor_dot/attack_self(mob/user as mob)
/obj/item/fluff/dragor_dot/attack_self(mob/user)
. = ..(user)
if(.)
return TRUE
if(user.ckey == "pontifexminimus")
add_verb(user, /mob/living/carbon/human/proc/shapeshifter_select_gender)
else
@@ -851,6 +868,7 @@
icon = 'icons/vore/custom_items_vr.dmi'
icon_state = "hisstective_badge"
//slot_flags = SLOT_TIE | SLOT_BELT
fluff_badge = TRUE
/obj/item/clothing/accessory/badge/holo/detective/ruda/attack(mob/living/carbon/human/M, mob/living/user)
if(isliving(user))
@@ -858,8 +876,10 @@
user.do_attack_animation(M)
user.setClickCooldown(DEFAULT_QUICK_COOLDOWN) //to prevent spam
/obj/item/clothing/accessory/badge/holo/detective/ruda/attack_self(mob/user as mob)
/obj/item/clothing/accessory/badge/holo/detective/ruda/attack_self(mob/user)
. = ..(user)
if(.)
return TRUE
if(!stored_name)
to_chat(user, "You huff along the front of your badge, then rub your sleeve on it to polish it up.")
set_name(user.real_name)
@@ -949,6 +969,7 @@
//Two Handed
var/wielded = 0
var/base_name = "stunstaff"
special_handling = TRUE
/obj/item/melee/baton/fluff/stunstaff/Initialize(mapload)
. = ..()
@@ -992,6 +1013,9 @@
update_held_icon()
/obj/item/melee/baton/fluff/stunstaff/attack_self(mob/user)
. = ..(user)
if(.)
return TRUE
if(bcell && bcell.charge > hitcost)
status = !status
to_chat(user, span_notice("[src] is now [status ? "on" : "off"]."))
@@ -1060,7 +1084,10 @@
edge = initial(edge)
w_class = initial(w_class)
/obj/item/melee/fluffstuff/attack_self(mob/living/user as mob)
/obj/item/melee/fluffstuff/attack_self(mob/living/user)
. = ..(user)
if(.)
return TRUE
if (active)
if ((CLUMSY in user.mutations) && prob(50))
user.visible_message(span_danger("\The [user] accidentally cuts \himself with \the [src]."),\
@@ -1311,6 +1338,9 @@
var/owner = "vitoras"
/obj/item/fluff/verie/attack_self(mob/living/carbon/human/user)
. = ..(user)
if(.)
return TRUE
if (istype(user))
// It's only made for Verie's chassis silly!
if (user.ckey != owner)
@@ -1531,8 +1561,12 @@
icon_state = "pandorba"
pokephrase = "Gecker!"
attack_verb = list("fluffed", "fwomped", "fuwa'd", "squirmshed")
special_handling = TRUE
/obj/item/toy/plushie/fluff/seona_mofuorb/attack_self(mob/user as mob)
/obj/item/toy/plushie/fluff/seona_mofuorb/attack_self(mob/user)
. = ..(user)
if(.)
return TRUE
if(stored_item && opened && !searching)
searching = TRUE
if(do_after(user, 1 SECOND, target = src))