cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-22 19:47:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Migrate solar panel assembly to the new attack chain. (#32400)

Browse Source 
* Migrate solar panel assembly to the new attack chain.

* Prevent infinite solar construction from one assembly.

* Apply solar-building suggestion from informal CRUNCH review.

* Apply suggestions from CRUNCH review.

Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
Signed-off-by: Alan <alfalfascout@users.noreply.github.com>

* Apply suggestion from CRUNCH review locally.

---------

Signed-off-by: Alan <alfalfascout@users.noreply.github.com>
Co-authored-by: CRUNCH <143041327+CRUNCH-Borg@users.noreply.github.com>
This commit is contained in:
Alan
2026-08-13 17:48:39 +00:00
committed by GitHub
co-authored by CRUNCH
parent 92a8535a8d
commit f6b562e6b6
1 changed files with 52 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/power/generators/solar.dm
+52 -34
View File
@@ -195,8 +195,9 @@
icon_state = "sp_base"
inhand_icon_state = "electropack"
w_class = WEIGHT_CLASS_BULKY // Pretty big!
var/tracker = 0
var/tracker = FALSE
var/glass_type = null
new_attack_chain = TRUE
/obj/item/solar_assembly/attack_hand(mob/user)
if(!anchored)
@@ -211,42 +212,59 @@
/obj/item/solar_assembly/examine(mob/user)
. = ..()
. += SPAN_NOTICE("The solar assembly is <b>[anchored ? "wrenched into place" : "unwrenched"]</b>.")
. += SPAN_NOTICE("[src] is <b>[anchored ? "wrenched into place" : "unwrenched"]</b>.")
if(tracker)
. += SPAN_NOTICE("The solar assembly has a tracking circuit installed. It can be <b>pried out</b>.")
. += SPAN_NOTICE("It has a tracking circuit installed. It can be <b>pried out</b>.")
else
. += SPAN_NOTICE("The solar assembly has a slot for a <i>tracking circuit</i> board.")
. += SPAN_NOTICE("It has a slot for a <i>tracking circuit</i> board.")
if(anchored)
.+= SPAN_NOTICE("The solar assembly needs <i>glass</i> to be completed.")
. += SPAN_NOTICE("It needs <i>glass</i> to be completed.")
/obj/item/solar_assembly/attackby__legacy__attackchain(obj/item/W, mob/user, params)
/obj/item/solar_assembly/item_interaction(mob/user, obj/item/used, list/modifiers)
if(istype(used, /obj/item/tracker_electronics))
if(tracker)
to_chat(user, SPAN_WARNING("There are already tracker electronics in [src]!"))
return ITEM_INTERACT_COMPLETE
if(!user.drop_item())
to_chat(user, SPAN_WARNING("[used] is stuck to your hand!"))
return ITEM_INTERACT_COMPLETE
tracker = TRUE
qdel(used)
user.visible_message(
SPAN_NOTICE("[user] inserts [used] into [src]."),
SPAN_NOTICE("You insert [used] into [src]."),
SPAN_NOTICE("You hear electronics click into place.")
)
add_fingerprint(user)
return ITEM_INTERACT_COMPLETE
if(anchored || !isturf(loc))
if(istype(W, /obj/item/stack/sheet/glass) || istype(W, /obj/item/stack/sheet/rglass) || istype(W, /obj/item/stack/sheet/plasmaglass) || istype(W, /obj/item/stack/sheet/plasmarglass) || istype(W, /obj/item/stack/sheet/plastitaniumglass))
var/obj/item/stack/sheet/S = W
if(S.use(2))
glass_type = S.merge_type
playsound(loc, S.usesound, 50, 1)
user.visible_message("[user] places the glass on the solar assembly.", SPAN_NOTICE("You place the glass on the solar assembly."))
if(tracker)
new /obj/machinery/power/tracker(get_turf(src), src)
else
new /obj/machinery/power/solar(get_turf(src), src)
else
to_chat(user, SPAN_WARNING("You need two sheets of glass to put them into a solar panel."))
return
return TRUE
if(istype(used, /obj/item/stack/sheet/glass) || \
istype(used, /obj/item/stack/sheet/rglass) || \
istype(used, /obj/item/stack/sheet/plasmaglass) || \
istype(used, /obj/item/stack/sheet/plasmarglass) || \
istype(used, /obj/item/stack/sheet/plastitaniumglass))
if(!anchored || !isturf(loc))
to_chat(user, SPAN_WARNING("You need to anchor [src] with a wrench before you can add glass!"))
return ITEM_INTERACT_COMPLETE
if(!tracker)
if(istype(W, /obj/item/tracker_electronics))
if(!user.drop_item())
return
tracker = TRUE
qdel(W)
user.visible_message("[user] inserts the electronics into the solar assembly.", SPAN_NOTICE("You insert the electronics into the solar assembly."))
return TRUE
else
return ..()
var/obj/item/stack/sheet/sheets = used
if(!sheets.use(2))
to_chat(user, SPAN_WARNING("You need two sheets of glass to finish [src]."))
return ITEM_INTERACT_COMPLETE
glass_type = sheets.merge_type
playsound(loc, sheets.usesound, 50, 1)
user.visible_message(
SPAN_NOTICE("[user] places [used] on [src]."),
SPAN_NOTICE("You place [used] on [src]."),
SPAN_HEAR("You hear glass panels click into place.")
)
if(tracker)
new /obj/machinery/power/tracker(get_turf(src), src)
else
new /obj/machinery/power/solar(get_turf(src), src)
return ITEM_INTERACT_COMPLETE
return ..()
/obj/item/solar_assembly/crowbar_act(mob/living/user, obj/item/I)
if(!tracker)
@@ -256,18 +274,18 @@
return
new /obj/item/tracker_electronics(loc)
tracker = FALSE
user.visible_message("[user] takes out the electronics from the solar assembly.", SPAN_NOTICE("You take out the electronics from the solar assembly."))
CROWBAR_PRY_CIRCUIT_SUCCESS_MESSAGE
/obj/item/solar_assembly/wrench_act(mob/living/user, obj/item/I)
if(!anchored && isturf(loc))
if(I.use_tool(src, user, I.tool_volume))
anchored = TRUE
user.visible_message("[user] wrenches the solar assembly into place.", SPAN_NOTICE("You wrench the solar assembly into place."))
WRENCH_ANCHOR_MESSAGE
return TRUE
else
if(I.use_tool(src, user, I.tool_volume))
anchored = FALSE
user.visible_message("[user] unwrenches the solar assembly from its place.", SPAN_NOTICE("You unwrench the solar assembly from its place."))
WRENCH_UNANCHOR_MESSAGE
return TRUE
//