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-25 09:46:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

repository subsystem touchups & moves materials/designs over (#6832)

Browse Source
This commit is contained in:
silicons
2024-11-05 15:22:44 +01:00
committed by GitHub
parent 219bb26cfc
commit 6ace2afd6a
278 changed files with 2614 additions and 2582 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/frames/frame_step.dm
+8 -8
View File
@@ -51,7 +51,7 @@
/// what to drop when undertaking this step
/// can either be:
/// * /obj/item/stack typepath
/// * /datum/material typepath
/// * /datum/prototype/material typepath
/// * /obj/item typepath
/// todo: text for 'drop context key'
var/drop
@@ -98,7 +98,7 @@
if(isnull(request_type))
// autodetect
var/detected
if(ispath(request, /datum/material))
if(ispath(request, /datum/prototype/material))
request_type = FRAME_REQUEST_TYPE_MATERIAL
else if(ispath(request, /obj/item/stack))
request_type = FRAME_REQUEST_TYPE_STACK
@@ -125,7 +125,7 @@
if(FRAME_REQUEST_TYPE_MATERIAL)
var/rendered_material
var/rendered_stack_name
var/datum/material/resolved = SSmaterials.resolve_material(request)
var/datum/prototype/material/resolved = RSmaterials.fetch(request)
rendered_material = resolved.display_name
rendered_stack_name = resolved.sheet_plural_name
. = "Apply [request_amount || 0] [rendered_stack_name] of <b>[rendered_material]</b> to [rendered_action]."
@@ -168,7 +168,7 @@
return using_tool?.tool_check(request, actor, frame, TOOL_OP_SILENT)
if(FRAME_REQUEST_TYPE_MATERIAL)
var/obj/item/stack/material/material_stack = using_tool
return istype(material_stack) && (ispath(request, /datum/material)? material_stack.material.type == request : material_stack.material.id == request)
return istype(material_stack) && (ispath(request, /datum/prototype/material)? material_stack.material.type == request : material_stack.material.id == request)
return FALSE
/**
@@ -250,13 +250,13 @@
new drop(drop_where, dropping)
left -= dropping
while(--safety > 0 && left > 0)
else if(ispath(drop, /datum/material))
else if(ispath(drop, /datum/prototype/material))
var/safety = 50
var/left = drop_amount
var/datum/material/resolved_material = SSmaterials.resolve_material(drop)
var/datum/prototype/material/resolved_material = RSmaterials.fetch(drop)
do
var/dropping = min(left, 50)
// todo: /datum/material based max stacks.
// todo: /datum/prototype/material based max stacks.
resolved_material.place_sheet(drop_where, dropping)
left -= dropping
while(--safety > 0 && left > 0)
@@ -332,7 +332,7 @@
if(FRAME_REQUEST_TYPE_MATERIAL, FRAME_REQUEST_TYPE_STACK)
var/name_to_use
if(request_type == FRAME_REQUEST_TYPE_MATERIAL)
var/datum/material/resolved_material = SSmaterials.resolve_material(request)
var/datum/prototype/material/resolved_material = RSmaterials.fetch(request)
name_to_use = "[resolved_material.name || resolved_material.display_name] [resolved_material.sheet_plural_name]"
else
var/obj/item/stack/casted_stack = request
code/modules/frames/types/solar_panel.dm
+1 -1
View File
@@ -9,7 +9,7 @@ AUTO_FRAME_DATUM(/datum/frame2/solar_panel, solar_panel, 'icons/machinery/power/
steps = list(
/datum/frame_step{
name = "finish panel";
request = /datum/material/glass;
request = /datum/prototype/material/glass;
request_amount = 1;
direction = TOOL_DIRECTION_FORWARDS;
stage = FRAME_STAGE_FINISH;