cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-27 15:18:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

[MIRROR] Begin clickcode attack_self fix (#12173)

Browse Source 
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
This commit is contained in:
CHOMPStation2StaffMirrorBot
2025-12-29 15:51:44 -05:00
committed by GitHub
co-authored by Cameron Lennox
parent 063cf6cf48
commit 3cac28f9ad
361 changed files with 2676 additions and 998 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/artstuff.dm
+3 -1
View File
@@ -84,7 +84,9 @@
grid[x][y] = canvas_color
/obj/item/canvas/attack_self(mob/user)
. = ..()
. = ..(user)
if(.)
return TRUE
tgui_interact(user)
/obj/item/canvas/dropped(mob/user)
code/game/objects/structures/bedsheet_bin.dm
+8 -1
View File
@@ -18,6 +18,8 @@ LINEN BINS
w_class = ITEMSIZE_SMALL
drop_sound = 'sound/items/drop/clothing.ogg'
pickup_sound = 'sound/items/pickup/clothing.ogg'
///var used for attack_self chain
var/special_handling = FALSE
/// Custom nouns to act as the subject of dreams //CHOMPEdit - Dreaming
var/list/dream_messages = list("white") //CHOMPEdit - Dreaming
@@ -26,7 +28,12 @@ LINEN BINS
. = ..()
AddElement(/datum/element/rotatable/onlyflip)
/obj/item/bedsheet/attack_self(mob/user as mob)
/obj/item/bedsheet/attack_self(mob/user)
. = ..(user)
if(.)
return TRUE
if(special_handling)
return FALSE
user.drop_item()
if(layer == initial(layer))
layer = ABOVE_MOB_LAYER
code/game/objects/structures/inflatable.dm
+15
View File
@@ -6,8 +6,15 @@
drop_sound = 'sound/items/drop/rubber.ogg'
w_class = ITEMSIZE_NORMAL
var/deploy_path = /obj/structure/inflatable
///Var used for attack_self chain
var/special_handling = FALSE
/obj/item/inflatable/attack_self(mob/user)
. = ..(user)
if(.)
return TRUE
if(special_handling)
return FALSE
inflate(user,user.loc)
/obj/item/inflatable/afterattack(var/atom/A, var/mob/user)
@@ -246,8 +253,12 @@
desc = "A folded membrane which rapidly expands into a large cubical shape on activation. It is too torn to be usable."
icon = 'icons/obj/inflatable.dmi'
icon_state = "folded_wall_torn"
special_handling = TRUE
/obj/item/inflatable/torn/attack_self(mob/user)
. = ..(user)
if(.)
return TRUE
to_chat(user, span_notice("The inflatable wall is too torn to be inflated!"))
add_fingerprint(user)
@@ -256,8 +267,12 @@
desc = "A folded membrane which rapidly expands into a simple door on activation. It is too torn to be usable."
icon = 'icons/obj/inflatable.dmi'
icon_state = "folded_door_torn"
special_handling = TRUE
/obj/item/inflatable/door/torn/attack_self(mob/user)
. = ..(user)
if(.)
return TRUE
to_chat(user, span_notice("The inflatable door is too torn to be inflated!"))
add_fingerprint(user)
code/game/objects/structures/pillows.dm
+5 -1
View File
@@ -8,8 +8,12 @@
slot_flags = 0
var/pile_type = "/obj/structure/bed/pillowpile"
throw_range = 7
special_handling = TRUE
/obj/item/bedsheet/pillow/attack_self(mob/user as mob)
/obj/item/bedsheet/pillow/attack_self(mob/user)
. = ..(user)
if(.)
return TRUE
user.drop_item()
if(icon_state == initial(icon_state))
icon_state = "[icon_state]_placed"
code/game/objects/structures/stool_bed_chair_nest/bed.dm
+7 -2
View File
@@ -268,6 +268,9 @@
pickup_sound = 'sound/items/pickup/axe.ogg'
/obj/item/roller/attack_self(mob/user)
. = ..(user)
if(.)
return TRUE
var/obj/structure/bed/roller/R = new bedtype(user.loc)
R.add_fingerprint(user)
qdel(src)
@@ -303,8 +306,10 @@
. = ..()
held = new /obj/item/roller(src)
/obj/item/roller_holder/attack_self(mob/user as mob)
/obj/item/roller_holder/attack_self(mob/user)
. = ..(user)
if(.)
return TRUE
if(!held)
to_chat(user, span_notice("The rack is empty."))
return
code/game/objects/structures/stool_bed_chair_nest/wheelchair_item.dm
+3
View File
@@ -8,6 +8,9 @@
var/unfolded_type = /obj/structure/bed/chair/wheelchair
/obj/item/wheelchair/attack_self(mob/user)
. = ..(user)
if(.)
return TRUE
var/obj/structure/bed/chair/wheelchair/R = new unfolded_type(user.loc)
R.add_fingerprint(user)
R.name = src.name
code/game/objects/structures/watercloset.dm
+75 -59
View File
@@ -312,18 +312,7 @@
slot_l_hand_str = 'icons/mob/items/lefthand.dmi',
slot_r_hand_str = 'icons/mob/items/righthand.dmi',
)
honk_sound = 'sound/voice/quack.ogg' //VOREStation edit
var/honk_text = 0
/obj/item/bikehorn/rubberducky/attack_self(mob/user)
if(spam_flag == 0)
spam_flag = 1
playsound(src, honk_sound, 50, 1)
if(honk_text)
audible_message(span_maroon("[honk_text]"))
src.add_fingerprint(user)
addtimer(VARSET_CALLBACK(src, spam_flag, 0), 20, TIMER_DELETE_ME)
return
honk_sound = 'sound/voice/quack.ogg'
//Admin spawn duckies
@@ -335,21 +324,24 @@
item_state = "rubberducky_red"
honk_sound = 'sound/effects/adminhelp.ogg'
var/honk_count = 0
special_handling = TRUE
/obj/item/bikehorn/rubberducky/red/attack_self(mob/user)
. = ..(user)
if(.)
return TRUE
if(honk_count >= 3)
var/turf/epicenter = get_turf(src)
explosion(epicenter, 0, 0, 1, 3)
qdel(src)
return
else if(spam_flag == 0)
spam_flag = 1
else if(cooldown <= world.time)
cooldown = (world.time + 2 SECONDS)
playsound(src, honk_sound, 50, 1)
src.add_fingerprint(user)
add_fingerprint(user)
if(honk_text)
audible_message(span_maroon("[honk_text]"))
honk_count ++
addtimer(VARSET_CALLBACK(src, spam_flag, 0), 20, TIMER_DELETE_ME)
honk_count++
return
/obj/item/bikehorn/rubberducky/blue
@@ -359,18 +351,20 @@
icon_state = "rubberducky_blue"
item_state = "rubberducky_blue"
honk_sound = 'sound/effects/bubbles.ogg'
var/honk_count = 0
special_handling = TRUE
/obj/item/bikehorn/rubberducky/blue/attack_self(mob/user)
if(spam_flag == 0)
var/turf/simulated/whereweare = get_turf(src)
whereweare.wet_floor(2)
spam_flag = 1
. = ..(user)
if(.)
return TRUE
if(cooldown <= world.time)
cooldown = (world.time + 2 SECONDS)
playsound(src, honk_sound, 50, 1)
add_fingerprint(user)
if(honk_text)
audible_message(span_maroon("[honk_text]"))
src.add_fingerprint(user)
addtimer(VARSET_CALLBACK(src, spam_flag, 0), 20, TIMER_DELETE_ME)
var/turf/simulated/whereweare = get_turf(src)
whereweare.wet_floor(2)
return
/obj/item/bikehorn/rubberducky/pink
@@ -380,23 +374,24 @@
icon_state = "rubberducky_pink"
item_state = "rubberducky_pink"
honk_sound = 'sound/vore/sunesound/pred/insertion_01.ogg'
var/honk_count = 0
special_handling = TRUE
/obj/item/bikehorn/rubberducky/pink/attack_self(mob/user)
if(spam_flag == 0)
. = ..(user)
if(.)
return TRUE
if(cooldown <= world.time)
if(!user.devourable)
to_chat(user, span_vnotice("You can't bring yourself to squeeze it..."))
return
spam_flag = 1
cooldown = (world.time + 2 SECONDS)
playsound(src, honk_sound, 50, 1)
add_fingerprint(user)
if(honk_text)
audible_message(span_maroon("[honk_text]"))
src.add_fingerprint(user)
user.drop_item()
user.forceMove(src)
to_chat(user, span_vnotice("You have been swallowed alive by the rubber ducky. Your entire body compacted up and squeezed into the tiny space that makes up the oddly realistic and not at all rubbery stomach. The walls themselves are kneading over you, grinding some sort of fluids into your trapped body. You can even hear the sound of bodily functions echoing around you..."))
addtimer(VARSET_CALLBACK(src, spam_flag, 0), 20, TIMER_DELETE_ME)
return
/obj/item/bikehorn/rubberducky/pink/container_resist(var/mob/living/escapee)
if(isdisposalpacket(loc))
@@ -412,23 +407,26 @@
icon_state = "rubberducky_grey"
item_state = "rubberducky_grey"
honk_sound = 'sound/effects/ghost.ogg'
var/honk_count = 0
special_handling = TRUE
/obj/item/bikehorn/rubberducky/grey/attack_self(mob/user)
if(spam_flag == 0)
. = ..(user)
if(.)
return TRUE
if(cooldown <= world.time)
cooldown = (world.time + 2 SECONDS)
playsound(src, honk_sound, 50, 1)
add_fingerprint(user)
if(honk_text)
audible_message(span_maroon("[honk_text]"))
for(var/obj/machinery/light/L in GLOB.machines)
if(L.z != user.z || get_dist(user,L) > 10)
continue
else
L.flicker(10)
spam_flag = 1
playsound(src, honk_sound, 50, 1)
if(honk_text)
audible_message(span_maroon("[honk_text]"))
src.add_fingerprint(user)
user.drop_item()
var/turf/T = locate(rand(1, 140), rand(1, 140), user.z)
src.forceMove(T)
forceMove(T)
return
/obj/item/bikehorn/rubberducky/green
@@ -438,7 +436,6 @@
icon_state = "rubberducky_green"
item_state = "rubberducky_green"
honk_sound = 'sound/arcade/mana.ogg'
var/honk_count = 0
var/list/flora = list(/obj/structure/flora/ausbushes,
/obj/structure/flora/ausbushes/reedbush,
/obj/structure/flora/ausbushes/leafybush,
@@ -455,18 +452,21 @@
/obj/structure/flora/ausbushes/ppflowers,
/obj/structure/flora/ausbushes/sparsegrass,
/obj/structure/flora/ausbushes/fullgrass)
special_handling = TRUE
/obj/item/bikehorn/rubberducky/green/attack_self(mob/user)
if(spam_flag == 0)
. = ..(user)
if(.)
return TRUE
if(cooldown <= world.time)
cooldown = (world.time + 2 SECONDS)
playsound(src, honk_sound, 50, 1)
add_fingerprint(user)
if(honk_text)
audible_message(span_maroon("[honk_text]"))
var/turf/simulated/whereweare = get_turf(src)
var/obj/P = pick(flora)
new P(whereweare)
spam_flag = 1
playsound(src, honk_sound, 50, 1)
if(honk_text)
audible_message(span_maroon("[honk_text]"))
src.add_fingerprint(user)
addtimer(VARSET_CALLBACK(src, spam_flag, 0), 20, TIMER_DELETE_ME)
return
/obj/item/bikehorn/rubberducky/white
@@ -476,16 +476,19 @@
icon_state = "rubberducky_white"
item_state = "rubberducky_white"
honk_sound = 'sound/effects/lightningshock.ogg'
var/honk_count = 0
special_handling = TRUE
/obj/item/bikehorn/rubberducky/white/attack_self(mob/user)
if(spam_flag == 0)
lightning_strike(get_turf(src), 1)
spam_flag = 1
. = ..(user)
if(.)
return TRUE
if(cooldown <= world.time)
cooldown = (world.time + 2 SECONDS)
playsound(src, honk_sound, 50, 1)
add_fingerprint(user)
if(honk_text)
audible_message(span_maroon("[honk_text]"))
src.add_fingerprint(user)
lightning_strike(get_turf(src), 1)
qdel(src)
return
@@ -505,11 +508,16 @@
icon_state = "rubberducky_gold"
item_state = "rubberducky_gold"
honk_sound = 'sound/voice/quack_reverb.ogg'
special_handling = TRUE
/obj/item/bikehorn/rubberducky/gold/attack_self(mob/user)
if(spam_flag == 0)
spam_flag = 1
. = ..(user)
if(.)
return TRUE
if(cooldown <= world.time)
cooldown = (world.time + 2 SECONDS)
playsound(src, honk_sound, 50, 1)
add_fingerprint(user)
if(honk_text)
audible_message(span_maroon("[honk_text]"))
if(isliving(user))
@@ -527,16 +535,20 @@
item_state = "rubberducky_viking"
honk_sound = 'sound/voice/scream_jelly_m1.ogg'
honk_text = "DUK ROH DAH!"
special_handling = TRUE
/obj/item/bikehorn/rubberducky/viking/attack_self(mob/user)
if(spam_flag == 0)
spam_flag = 1
. = ..(user)
if(.)
return TRUE
if(cooldown <= world.time)
cooldown = (world.time + 2 SECONDS)
playsound(src, honk_sound, 50, 1)
add_fingerprint(user)
if(honk_text)
audible_message(span_maroon("[honk_text]"))
user.drop_item()
user.throw_at_random(FALSE,9,2)
addtimer(VARSET_CALLBACK(src, spam_flag, 0), 20, TIMER_DELETE_ME)
return
/obj/item/bikehorn/rubberducky/galaxy
@@ -546,11 +558,16 @@
icon_state = "rubberducky_galaxy"
item_state = "rubberducky_galaxy"
honk_sound = 'sound/effects/teleport.ogg'
special_handling = TRUE
/obj/item/bikehorn/rubberducky/galaxy/attack_self(mob/user)
if(spam_flag == 0)
spam_flag = 1
. = ..(user)
if(.)
return TRUE
if(cooldown <= world.time)
cooldown = (world.time + 2 SECONDS)
playsound(src, honk_sound, 50, 1)
add_fingerprint(user)
if(honk_text)
audible_message(span_maroon("[honk_text]"))
var/list/possible_orbiters = list()
@@ -560,7 +577,6 @@
possible_orbiters += M
var/atom/movable/selected_orbiter = pick(possible_orbiters)
selected_orbiter.orbit(user,32,TRUE,20,36)
addtimer(VARSET_CALLBACK(src, spam_flag, 0), 20, TIMER_DELETE_ME)
return
//////////////////////////////SINKS//////////////////////////////