cyberpresidentvanellope/Citadel-Station-13-RP
1
0
Fork 0
mirror of https://github.com/Citadel-Station-13/Citadel-Station-13-RP.git synced 2026-08-22 04:39:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

bugfix / tweaks (#6959)

Browse Source
This commit is contained in:
silicons
2025-01-10 17:34:32 +01:00
committed by GitHub
parent a0e8babdf1
commit aed3013410
60 changed files with 677 additions and 287 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/frames/frame_step.dm
+8 -2
View File
@@ -30,6 +30,11 @@
var/request_type
/// ergo: stack type, item type, tool function, etc. what this is depends on [step_type]
/// limited autodetection is allowed.
///
/// allowed:
/// * /datum/prototype/material path
/// * /obj/item/stack path
/// * /obj/item path
var/request
/// * stacks: amount
/// * items: amount; if 0, we just apply the item to it
@@ -157,11 +162,12 @@
/datum/frame_step/proc/valid_interaction(datum/event_args/actor/actor, obj/item/using_tool, datum/frame2/frame_datum, obj/structure/frame2/frame)
switch(request_type)
if(FRAME_REQUEST_TYPE_INTERACT)
return TRUE
return isnull(using_tool)
if(FRAME_REQUEST_TYPE_ITEM)
return using_tool?.type == request
if(FRAME_REQUEST_TYPE_STACK)
return using_tool?.type == request
var/obj/item/stack/using_stack = using_tool
return using_stack.can_use_as_type(request)
if(FRAME_REQUEST_TYPE_PROC)
return FALSE // override this proc
if(FRAME_REQUEST_TYPE_TOOL)
code/modules/frames/types/fire_alarm.dm
+1 -1
View File
@@ -46,7 +46,7 @@ AUTO_FRAME_DATUM(/datum/frame2/fire_alarm, fire_alarm, 'icons/machinery/fire_ala
steps = list(
/datum/frame_step{
request = /obj/item/stack/cable_coil;
name = "unsecure circuit";
name = "wire circuit";
request_amount = 1;
stage = "wired";
direction = TOOL_DIRECTION_FORWARDS;