mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2026-08-24 21:57:53 +01:00
[MIRROR] Begin clickcode attack_self fix (#12173)
Co-authored-by: Cameron Lennox <killer65311@gmail.com>
This commit is contained in:
co-authored by
Cameron Lennox
parent
063cf6cf48
commit
3cac28f9ad
@@ -10,7 +10,10 @@
|
||||
var/range = 2
|
||||
var/exact = FALSE
|
||||
|
||||
/obj/item/mining_scanner/attack_self(mob/user as mob)
|
||||
/obj/item/mining_scanner/attack_self(mob/user)
|
||||
. = ..(user)
|
||||
if(.)
|
||||
return TRUE
|
||||
to_chat(user, span_notice("You begin sweeping \the [src] about, scanning for metal deposits."))
|
||||
playsound(src, 'sound/items/goggles_charge.ogg', 50, 1, -6)
|
||||
|
||||
|
||||
@@ -15,6 +15,9 @@
|
||||
. += "It has [uses_left] use\s remaining."
|
||||
|
||||
/obj/item/extraction_pack/attack_self(mob/user)
|
||||
. = ..(user)
|
||||
if(.)
|
||||
return TRUE
|
||||
var/list/possible_beacons = list()
|
||||
for(var/obj/structure/extraction_point/EP as anything in GLOB.total_extraction_beacons)
|
||||
if(EP.beacon_network in beacon_networks)
|
||||
@@ -143,6 +146,11 @@
|
||||
icon_state = "extraction_pointoff"
|
||||
|
||||
/obj/item/fulton_core/attack_self(mob/user)
|
||||
. = ..(user)
|
||||
if(.)
|
||||
return TRUE
|
||||
var/turf/T = get_turf(user)
|
||||
var/outdoors = T.is_outdoors()
|
||||
if(do_after(user, 1.5 SECONDS, target = user) && !QDELETED(src))
|
||||
new /obj/structure/extraction_point(get_turf(user))
|
||||
qdel(src)
|
||||
|
||||
@@ -246,6 +246,9 @@
|
||||
STOP_PROCESSING(SSprocessing, src)
|
||||
|
||||
/obj/item/kinetic_crusher/machete/gauntlets/attack_self(mob/user)
|
||||
. = ..(user)
|
||||
if(.)
|
||||
return TRUE
|
||||
ready_toggle()
|
||||
|
||||
/obj/item/kinetic_crusher/machete/gauntlets/process()
|
||||
|
||||
@@ -210,6 +210,7 @@
|
||||
icon = 'icons/obj/mining.dmi'
|
||||
var/upright = 0
|
||||
var/base_state
|
||||
custom_handling = TRUE
|
||||
|
||||
/obj/item/stack/flag/Initialize(mapload)
|
||||
. = ..()
|
||||
@@ -251,7 +252,10 @@
|
||||
else
|
||||
..()
|
||||
|
||||
/obj/item/stack/flag/attack_self(mob/user as mob)
|
||||
/obj/item/stack/flag/attack_self(mob/user)
|
||||
. = ..(user)
|
||||
if(.)
|
||||
return TRUE
|
||||
|
||||
var/obj/item/stack/flag/F = locate() in get_turf(src)
|
||||
|
||||
@@ -273,7 +277,7 @@
|
||||
newflag.visible_message(span_infoplain(span_bold("[user]") + " plants [newflag] firmly in the ground."))
|
||||
src.use(1)
|
||||
|
||||
// Lightpoles for lumber colony
|
||||
// Lightpoles for lumber colony //CHOMPEdit Start
|
||||
/obj/item/stack/lightpole
|
||||
name = "Trailblazers"
|
||||
desc = "Some colourful trail lights."
|
||||
@@ -285,6 +289,7 @@
|
||||
var/base_state
|
||||
var/on = 0
|
||||
var/brightness_on = 4 //luminosity when on
|
||||
custom_handling = TRUE
|
||||
|
||||
/obj/item/stack/lightpole/Initialize(mapload)
|
||||
. = ..()
|
||||
@@ -318,7 +323,9 @@
|
||||
..()
|
||||
|
||||
/obj/item/stack/lightpole/attack_self(mob/user as mob)
|
||||
|
||||
. = ..(user)
|
||||
if(.)
|
||||
return TRUE
|
||||
var/obj/item/stack/lightpole/F = locate() in get_turf(src)
|
||||
|
||||
var/turf/T = get_turf(src)
|
||||
@@ -340,3 +347,4 @@
|
||||
newlightpole.icon_state = "[newlightpole.base_state]_on"
|
||||
newlightpole.visible_message("<b>[user]</b> plants [newlightpole] firmly in the ground.")
|
||||
src.use(1)
|
||||
//CHOMPEdit End
|
||||
|
||||
@@ -85,6 +85,9 @@
|
||||
fieldsactive--
|
||||
|
||||
/obj/item/resonator/attack_self(mob/user)
|
||||
. = ..(user)
|
||||
if(.)
|
||||
return TRUE
|
||||
switch(tgui_alert(user, "Change Detonation Time or toggle Cascading?","Setting", list("Toggle Cascade", "Resonance Time")))
|
||||
if("Resonance Time")
|
||||
if(burst_time == 50)
|
||||
|
||||
@@ -180,6 +180,9 @@ GLOBAL_LIST_EMPTY(unique_deployable)
|
||||
|
||||
// CHOMPEdit Start
|
||||
/obj/item/survivalcapsule/attack_self(mob/user)
|
||||
. = ..(user)
|
||||
if(.)
|
||||
return TRUE
|
||||
//Can't grab when capsule is New() because templates aren't loaded then
|
||||
if(istype(get_area(user), /area/vr))
|
||||
to_chat(user, span_danger("\The [src] does not appear to work in VR! This is useless to you!"))
|
||||
|
||||
Reference in New Issue
Block a user