mirror of
https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git
synced 2025-12-10 09:54:52 +00:00
minor issue
This commit is contained in:
@@ -808,7 +808,7 @@ GLOBAL_LIST_INIT(plastic_recipes, list(
|
|||||||
new /datum/stack_recipe("water bottle", /obj/item/reagent_containers/glass/beaker/waterbottle/empty), \
|
new /datum/stack_recipe("water bottle", /obj/item/reagent_containers/glass/beaker/waterbottle/empty), \
|
||||||
new /datum/stack_recipe("large water bottle", /obj/item/reagent_containers/glass/beaker/waterbottle/large/empty,3), \
|
new /datum/stack_recipe("large water bottle", /obj/item/reagent_containers/glass/beaker/waterbottle/large/empty,3), \
|
||||||
new /datum/stack_recipe("shower curtain", /obj/structure/curtain, 10, time = 10, one_per_turf = 1, on_floor = 1), \
|
new /datum/stack_recipe("shower curtain", /obj/structure/curtain, 10, time = 10, one_per_turf = 1, on_floor = 1), \
|
||||||
new /datum/stack_recipe("duct", /obj/item/stack/ducts, 1, 1, 20), \
|
new /datum/stack_recipe("duct", /obj/item/stack/ducts, 1, 5, 50), \
|
||||||
new /datum/stack_recipe("laser pointer case", /obj/item/glasswork/glass_base/laserpointer_shell, 30), \
|
new /datum/stack_recipe("laser pointer case", /obj/item/glasswork/glass_base/laserpointer_shell, 30), \
|
||||||
new /datum/stack_recipe("wet floor sign", /obj/item/clothing/suit/caution, 2)))
|
new /datum/stack_recipe("wet floor sign", /obj/item/clothing/suit/caution, 2)))
|
||||||
|
|
||||||
|
|||||||
@@ -514,44 +514,3 @@
|
|||||||
/obj/item/stack/microwave_act(obj/machinery/microwave/M)
|
/obj/item/stack/microwave_act(obj/machinery/microwave/M)
|
||||||
if(istype(M) && M.dirty < 100)
|
if(istype(M) && M.dirty < 100)
|
||||||
M.dirty += amount
|
M.dirty += amount
|
||||||
|
|
||||||
/*
|
|
||||||
* Recipe datum
|
|
||||||
*/
|
|
||||||
/datum/stack_recipe
|
|
||||||
var/title = "ERROR"
|
|
||||||
var/result_type
|
|
||||||
var/req_amount = 1
|
|
||||||
var/res_amount = 1
|
|
||||||
var/max_res_amount = 1
|
|
||||||
var/time = 0
|
|
||||||
var/one_per_turf = FALSE
|
|
||||||
var/on_floor = FALSE
|
|
||||||
var/placement_checks = FALSE
|
|
||||||
var/applies_mats = FALSE
|
|
||||||
var/trait_booster = null
|
|
||||||
var/trait_modifier = 1
|
|
||||||
|
|
||||||
/datum/stack_recipe/New(title, result_type, req_amount = 1, res_amount = 1, max_res_amount = 1,time = 0, one_per_turf = FALSE, on_floor = FALSE, window_checks = FALSE, placement_checks = FALSE, applies_mats = FALSE, trait_booster = null, trait_modifier = 1)
|
|
||||||
src.title = title
|
|
||||||
src.result_type = result_type
|
|
||||||
src.req_amount = req_amount
|
|
||||||
src.res_amount = res_amount
|
|
||||||
src.max_res_amount = max_res_amount
|
|
||||||
src.time = time
|
|
||||||
src.one_per_turf = one_per_turf
|
|
||||||
src.on_floor = on_floor
|
|
||||||
src.placement_checks = placement_checks
|
|
||||||
src.applies_mats = applies_mats
|
|
||||||
src.trait_booster = trait_booster
|
|
||||||
src.trait_modifier = trait_modifier
|
|
||||||
/*
|
|
||||||
* Recipe list datum
|
|
||||||
*/
|
|
||||||
/datum/stack_recipe_list
|
|
||||||
var/title = "ERROR"
|
|
||||||
var/list/recipes
|
|
||||||
|
|
||||||
/datum/stack_recipe_list/New(title, recipes)
|
|
||||||
src.title = title
|
|
||||||
src.recipes = recipes
|
|
||||||
|
|||||||
69
code/game/objects/items/stacks/stack_recipe.dm
Normal file
69
code/game/objects/items/stacks/stack_recipe.dm
Normal file
@@ -0,0 +1,69 @@
|
|||||||
|
|
||||||
|
/*
|
||||||
|
* Recipe datum
|
||||||
|
*/
|
||||||
|
/datum/stack_recipe
|
||||||
|
/// The title of the recipe
|
||||||
|
var/title = "ERROR"
|
||||||
|
/// What atom the recipe makes, typepath
|
||||||
|
var/atom/result_type
|
||||||
|
/// Amount of stack required to make
|
||||||
|
var/req_amount = 1
|
||||||
|
/// Amount of resulting atoms made
|
||||||
|
var/res_amount = 1
|
||||||
|
/// Max amount of resulting atoms made
|
||||||
|
var/max_res_amount = 1
|
||||||
|
/// How long it takes to make
|
||||||
|
var/time = 0
|
||||||
|
/// If only one of the resulting atom is allowed per turf
|
||||||
|
var/one_per_turf = FALSE
|
||||||
|
/// If the atom requires a floor below
|
||||||
|
var/on_floor = FALSE
|
||||||
|
/// Bitflag of additional placement checks required to place. (STACK_CHECK_CARDINALS|STACK_CHECK_ADJACENT)
|
||||||
|
var/placement_checks = NONE
|
||||||
|
/// If TRUE, the created atom will gain custom mat datums
|
||||||
|
var/applies_mats = FALSE
|
||||||
|
/// What trait, if any, boosts the construction speed of this item
|
||||||
|
var/trait_booster
|
||||||
|
/// How much the trait above, if supplied, boosts the construct speed of this item
|
||||||
|
var/trait_modifier = 1
|
||||||
|
|
||||||
|
/datum/stack_recipe/New(
|
||||||
|
title,
|
||||||
|
result_type,
|
||||||
|
req_amount = 1,
|
||||||
|
res_amount = 1,
|
||||||
|
max_res_amount = 1,
|
||||||
|
time = 0,
|
||||||
|
one_per_turf = FALSE,
|
||||||
|
on_floor = FALSE,
|
||||||
|
window_checks = FALSE,
|
||||||
|
placement_checks = NONE,
|
||||||
|
applies_mats = FALSE,
|
||||||
|
trait_booster,
|
||||||
|
trait_modifier = 1,
|
||||||
|
)
|
||||||
|
|
||||||
|
src.title = title
|
||||||
|
src.result_type = result_type
|
||||||
|
src.req_amount = req_amount
|
||||||
|
src.res_amount = res_amount
|
||||||
|
src.max_res_amount = max_res_amount
|
||||||
|
src.time = time
|
||||||
|
src.one_per_turf = one_per_turf
|
||||||
|
src.on_floor = on_floor
|
||||||
|
src.placement_checks = placement_checks
|
||||||
|
src.applies_mats = applies_mats
|
||||||
|
src.trait_booster = trait_booster
|
||||||
|
src.trait_modifier = trait_modifier
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Recipe list datum
|
||||||
|
*/
|
||||||
|
/datum/stack_recipe_list
|
||||||
|
var/title = "ERROR"
|
||||||
|
var/list/recipes
|
||||||
|
|
||||||
|
/datum/stack_recipe_list/New(title, recipes)
|
||||||
|
src.title = title
|
||||||
|
src.recipes = recipes
|
||||||
@@ -1305,6 +1305,7 @@
|
|||||||
#include "code\game\objects\items\stacks\medical.dm"
|
#include "code\game\objects\items\stacks\medical.dm"
|
||||||
#include "code\game\objects\items\stacks\rods.dm"
|
#include "code\game\objects\items\stacks\rods.dm"
|
||||||
#include "code\game\objects\items\stacks\stack.dm"
|
#include "code\game\objects\items\stacks\stack.dm"
|
||||||
|
#include "code\game\objects\items\stacks\stack_recipe.dm"
|
||||||
#include "code\game\objects\items\stacks\tape.dm"
|
#include "code\game\objects\items\stacks\tape.dm"
|
||||||
#include "code\game\objects\items\stacks\telecrystal.dm"
|
#include "code\game\objects\items\stacks\telecrystal.dm"
|
||||||
#include "code\game\objects\items\stacks\tickets.dm"
|
#include "code\game\objects\items\stacks\tickets.dm"
|
||||||
|
|||||||
Reference in New Issue
Block a user