Skip to content
This repository was archived by the owner on Sep 8, 2022. It is now read-only.
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
188 changes: 188 additions & 0 deletions code/datums/greyscale/greyscale_configs.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,188 @@
/datum/greyscale_config/canister
name = "Default Canister"
icon_file = 'icons/obj/atmospherics/canisters.dmi'
json_config = 'code/datums/greyscale/json_configs/canister_default.json'

/datum/greyscale_config/canister/base
name = "Base Canister Style"
json_config = 'code/datums/greyscale/json_configs/canister_base.json'

/datum/greyscale_config/canister/post_effects
name = "Canister Post-Effects"
json_config = 'code/datums/greyscale/json_configs/canister_post_effects.json'

/datum/greyscale_config/canister/stripe
name = "Single Striped Canister"
json_config = 'code/datums/greyscale/json_configs/canister_stripe.json'

/datum/greyscale_config/canister/double_stripe
name = "Double Striped Canister"
json_config = 'code/datums/greyscale/json_configs/canister_double_stripe.json'

/datum/greyscale_config/canister/hazard
name = "Hazard Striped Canister"
json_config = 'code/datums/greyscale/json_configs/canister_hazard.json'

/datum/greyscale_config/prototype_canister
name = "Prototype Canister"
icon_file = 'icons/obj/atmospherics/prototype_canister.dmi'
json_config = 'code/datums/greyscale/json_configs/canister_proto.json'

/datum/greyscale_config/screwdriver
name = "Screwdriver"
icon_file = 'icons/obj/tools.dmi'
json_config = 'code/datums/greyscale/json_configs/screwdriver.json'

/datum/greyscale_config/screwdriver_inhand_left
name = "Held Screwdriver, Left"
icon_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi'
json_config = 'code/datums/greyscale/json_configs/screwdriver_worn.json'

/datum/greyscale_config/screwdriver_inhand_right
name = "Held Screwdriver, Right"
icon_file = 'icons/mob/inhands/equipment/tools_righthand.dmi'
json_config = 'code/datums/greyscale/json_configs/screwdriver_worn.json'

/datum/greyscale_config/screwdriver_belt
name = "Belt Worn Screwdriver"
icon_file = 'icons/obj/clothing/belt_overlays.dmi'
json_config = 'code/datums/greyscale/json_configs/screwdriver_worn.json'

/datum/greyscale_config/jumpsuit
name = "Jumpsuit"
icon_file = 'icons/obj/clothing/uniforms.dmi'
json_config = 'code/datums/greyscale/json_configs/jumpsuit.json'

/datum/greyscale_config/jumpsuit_worn
name = "Worn Jumpsuit"
icon_file = 'icons/mob/clothing/uniform.dmi'
json_config = 'code/datums/greyscale/json_configs/jumpsuit_worn.json'

/datum/greyscale_config/jumpsuit_inhand_left
name = "Held Jumpsuit, Left"
icon_file = 'icons/mob/inhands/clothing_lefthand.dmi'
json_config = 'code/datums/greyscale/json_configs/jumpsuit_inhand.json'

/datum/greyscale_config/jumpsuit_inhand_right
name = "Held Jumpsuit, Right"
icon_file = 'icons/mob/inhands/clothing_righthand.dmi'
json_config = 'code/datums/greyscale/json_configs/jumpsuit_inhand.json'

/datum/greyscale_config/jumpsuit_prison
name = "Prison Jumpsuit"
icon_file = 'icons/obj/clothing/uniforms.dmi'
json_config = 'code/datums/greyscale/json_configs/jumpsuit_prison.json'

/datum/greyscale_config/jumpsuit_prison_worn
name = "Worn Prison Jumpsuit"
icon_file = 'icons/mob/clothing/uniform.dmi'
json_config = 'code/datums/greyscale/json_configs/jumpsuit_prison_worn.json'

/datum/greyscale_config/jumpsuit_prison_inhand_left
name = "Held Prison Jumpsuit, Left"
icon_file = 'icons/mob/inhands/clothing_lefthand.dmi'
json_config = 'code/datums/greyscale/json_configs/jumpsuit_prison_inhand.json'

/datum/greyscale_config/jumpsuit_prison_inhand_right
name = "Held Prison Jumpsuit, Right"
icon_file = 'icons/mob/inhands/clothing_righthand.dmi'
json_config = 'code/datums/greyscale/json_configs/jumpsuit_prison_inhand.json'

/datum/greyscale_config/sneakers
name = "Sneakers"
icon_file = 'icons/obj/clothing/shoes.dmi'
json_config = 'code/datums/greyscale/json_configs/sneakers.json'

/datum/greyscale_config/sneakers_worn
name = "Worn Sneakers"
icon_file = 'icons/mob/clothing/feet.dmi'
json_config = 'code/datums/greyscale/json_configs/sneakers_worn.json'

/datum/greyscale_config/sneakers_orange
name = "Orange Sneakers"
icon_file = 'icons/obj/clothing/shoes.dmi'
json_config = 'code/datums/greyscale/json_configs/sneakers_orange.json'

/datum/greyscale_config/sneakers_orange_worn
name = "Worn Orange Sneakers"
icon_file = 'icons/mob/clothing/feet.dmi'
json_config = 'code/datums/greyscale/json_configs/sneakers_orange_worn.json'

/datum/greyscale_config/sneakers_wheelys
name = "Wheeled Sneakers"
icon_file = 'icons/obj/clothing/shoes.dmi'
json_config = 'code/datums/greyscale/json_configs/sneakers_wheelys.json'

/datum/greyscale_config/sneakers_marisa
name = "Sneakers marisa"
icon_file = 'icons/obj/clothing/shoes.dmi'
json_config = 'code/datums/greyscale/json_configs/sneakers_marisa.json'

/datum/greyscale_config/plasmaman_helmet_default
name = "Default plasmaman helmet"
icon_file = 'icons/obj/clothing/hats.dmi'
json_config = 'code/datums/greyscale/json_configs/plasmaman_helmet_default.json'

/datum/greyscale_config/plasmaman_helmet_default_worn
name = "Default plasmaman helmet"
icon_file = 'icons/mob/clothing/head.dmi'
json_config = 'code/datums/greyscale/json_configs/plasmaman_helmet_default_worn.json'

/datum/greyscale_config/plasmaman_helmet_mark2
name = "Mark II plasmaman helmet"
icon_file = 'icons/obj/clothing/hats.dmi'
json_config = 'code/datums/greyscale/json_configs/plasmaman_helmet_mk2.json'

/datum/greyscale_config/plasmaman_helmet_mark2_worn
name = "Mark II plasmaman helmet"
icon_file = 'icons/mob/clothing/head.dmi'
json_config = 'code/datums/greyscale/json_configs/plasmaman_helmet_mk2_worn.json'

/datum/greyscale_config/plasmaman_helmet_protective
name = "Protective plasmaman helmet"
icon_file = 'icons/obj/clothing/hats.dmi'
json_config = 'code/datums/greyscale/json_configs/plasmaman_helmet_protective.json'

/datum/greyscale_config/plasmaman_helmet_protective_worn
name = "Protective plasmaman helmet"
icon_file = 'icons/mob/clothing/head.dmi'
json_config = 'code/datums/greyscale/json_configs/plasmaman_helmet_protective_worn.json'

/datum/greyscale_config/plasmaman_helmet_default_inhand_left
name = "Held Default plasmam helmet, left"
icon_file = 'icons/mob/inhands/clothing_lefthand.dmi'
json_config = 'code/datums/greyscale/json_configs/plasmaman_helmet_default_inhand.json'

/datum/greyscale_config/plasmaman_helmet_default_inhand_right
name = "Held Default plasmam helmet, right"
icon_file = 'icons/mob/inhands/clothing_righthand.dmi'
json_config = 'code/datums/greyscale/json_configs/plasmaman_helmet_default_inhand.json'

/datum/greyscale_config/plasmaman_helmet_protective_inhand_left
name = "Held Protective plasmam helmet, left"
icon_file = 'icons/mob/inhands/clothing_lefthand.dmi'
json_config = 'code/datums/greyscale/json_configs/plasmaman_helmet_protective_inhand.json'

/datum/greyscale_config/plasmaman_helmet_protective_inhand_right
name = "Held Protective plasmam helmet, right"
icon_file = 'icons/mob/inhands/clothing_righthand.dmi'
json_config = 'code/datums/greyscale/json_configs/plasmaman_helmet_protective_inhand.json'

/datum/greyscale_config/plasmaman_helmet_mark2_inhand_left
name = "Held Mark II plasmam helmet, left"
icon_file = 'icons/mob/inhands/clothing_lefthand.dmi'
json_config = 'code/datums/greyscale/json_configs/plasmaman_helmet_mk2_inhand.json'

/datum/greyscale_config/plasmaman_helmet_mark2_inhand_right
name = "Held Mark II plasmam helmet, right"
icon_file = 'icons/mob/inhands/clothing_righthand.dmi'
json_config = 'code/datums/greyscale/json_configs/plasmaman_helmet_mk2_inhand.json'

/datum/greyscale_config/carp
name = "Space Carp"
icon_file = 'icons/mob/carp.dmi'
json_config = 'code/datums/greyscale/json_configs/carp.json'

/datum/greyscale_config/carp/disk_mouth
name = "Space Carp Disk in Mouth"
json_config = 'code/datums/greyscale/json_configs/carp_disk_mouth.json'
4 changes: 3 additions & 1 deletion code/datums/mutable_appearance.dm
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,12 @@
// And yes this does have to be in the constructor, BYOND ignores it if you set it as a normal var

// Helper similar to image()
/proc/mutable_appearance(icon, icon_state = "", layer = FLOAT_LAYER, plane = FLOAT_PLANE)
/proc/mutable_appearance(icon, icon_state = "", layer = FLOAT_LAYER, plane = FLOAT_PLANE, color)
var/mutable_appearance/MA = new()
MA.icon = icon
MA.icon_state = icon_state
MA.layer = layer
MA.plane = plane
if(color)
MA.color = color
return MA
93 changes: 93 additions & 0 deletions code/game/objects/items/stacks/sheets/sheet_types.dm
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
* Metal
*/
GLOBAL_LIST_INIT(metal_recipes, list ( \
<<<<<<< HEAD
new/datum/stack_recipe("stool", /obj/structure/chair/stool, one_per_turf = TRUE, on_floor = TRUE), \
new/datum/stack_recipe("bar stool", /obj/structure/chair/stool/bar, one_per_turf = TRUE, on_floor = TRUE), \
new/datum/stack_recipe("chair", /obj/structure/chair, one_per_turf = TRUE, on_floor = TRUE), \
Expand Down Expand Up @@ -45,6 +46,49 @@ GLOBAL_LIST_INIT(metal_recipes, list ( \
new /datum/stack_recipe("sofa (left)", /obj/structure/chair/sofa/corp/left, one_per_turf = TRUE, on_floor = TRUE), \
new /datum/stack_recipe("sofa (right)", /obj/structure/chair/sofa/corp/right, one_per_turf = TRUE, on_floor = TRUE), \
new /datum/stack_recipe("sofa (corner)", /obj/structure/chair/sofa/corp/corner, one_per_turf = TRUE, on_floor = TRUE), \
=======
new/datum/stack_recipe("stool", /obj/structure/chair/stool, one_per_turf = TRUE, on_floor = TRUE, time = 15), \
new/datum/stack_recipe("bar stool", /obj/structure/chair/stool/bar, one_per_turf = TRUE, on_floor = TRUE, time = 15), \
new/datum/stack_recipe("chair", /obj/structure/chair, one_per_turf = TRUE, on_floor = TRUE, time = 20), \

null, \
new/datum/stack_recipe_list("office chairs", list( \
new/datum/stack_recipe("dark office chair", /obj/structure/chair/office, 5, one_per_turf = TRUE, on_floor = TRUE, time = 15), \
new/datum/stack_recipe("light office chair", /obj/structure/chair/office/light, 5, one_per_turf = TRUE, on_floor = TRUE, time = 15), \
)), \
new/datum/stack_recipe_list("beds", list( \
new/datum/stack_recipe("single bed", /obj/structure/bed, 2, one_per_turf = TRUE, on_floor = TRUE, time = 20), \
new/datum/stack_recipe("double bed", /obj/structure/bed/double, 2, one_per_turf = TRUE, on_floor = TRUE, time = 40), \
)), \
new/datum/stack_recipe_list("comfy chairs", list( \
new/datum/stack_recipe("comfy chair", /obj/structure/chair/fancy/comfy, 2, one_per_turf = TRUE, on_floor = TRUE, time = 20), \
new/datum/stack_recipe("corporate chair", /obj/structure/chair/fancy/corp, 2, one_per_turf = TRUE, on_floor = TRUE, time = 20), \
new/datum/stack_recipe("shuttle seat", /obj/structure/chair/fancy/shuttle, 2, one_per_turf = TRUE, on_floor = TRUE, time = 20), \
)), \
new/datum/stack_recipe_list("old sofa", list(
new /datum/stack_recipe("old sofa (middle)", /obj/structure/chair/fancy/sofa/old, 1, one_per_turf = TRUE, on_floor = TRUE, time = 20), \
new /datum/stack_recipe("old sofa (left)", /obj/structure/chair/fancy/sofa/old/left, 1, one_per_turf = TRUE, on_floor = TRUE, time = 20), \
new /datum/stack_recipe("old sofa (right)", /obj/structure/chair/fancy/sofa/old/right, 1, one_per_turf = TRUE, on_floor = TRUE, time = 20), \
new /datum/stack_recipe("old sofa (concave corner)", /obj/structure/chair/fancy/sofa/old/corner/concave, 1, one_per_turf = TRUE, on_floor = TRUE, time = 20), \
new /datum/stack_recipe("old sofa (convex corner)", /obj/structure/chair/fancy/sofa/old/corner/convex, 1, one_per_turf = TRUE, on_floor = TRUE, time = 20), \
)), \
new /datum/stack_recipe_list("corporate sofas", list( \
new /datum/stack_recipe("corporate sofa (middle)", /obj/structure/chair/fancy/sofa/corp, 1, one_per_turf = TRUE, on_floor = TRUE, time = 20), \
new /datum/stack_recipe("corporate sofa (left)", /obj/structure/chair/fancy/sofa/corp/left, 1, one_per_turf = TRUE, on_floor = TRUE, time = 20), \
new /datum/stack_recipe("corporate sofa (right)", /obj/structure/chair/fancy/sofa/corp/right, 1, one_per_turf = TRUE, on_floor = TRUE, time = 20), \
new /datum/stack_recipe("corporate sofa (concave corner)", /obj/structure/chair/fancy/sofa/corp/corner/concave, 1, one_per_turf = TRUE, on_floor = TRUE, time = 20), \
new /datum/stack_recipe("corporate sofa (convex corner)", /obj/structure/chair/fancy/sofa/corp/corner/convex, 1, one_per_turf = TRUE, on_floor = TRUE, time = 20), \
)), \
new /datum/stack_recipe_list("benches", list( \
new /datum/stack_recipe("bench (middle)", /obj/structure/chair/fancy/bench, 1, one_per_turf = TRUE, on_floor = TRUE, time = 20), \
new /datum/stack_recipe("bench (left)", /obj/structure/chair/fancy/bench/left, 1, one_per_turf = TRUE, on_floor = TRUE, time = 20), \
new /datum/stack_recipe("bench (right)", /obj/structure/chair/fancy/bench/right, 1, one_per_turf = TRUE, on_floor = TRUE, time = 20), \
)), \
new /datum/stack_recipe_list("corporate benches", list( \
new /datum/stack_recipe("corporate bench (middle)", /obj/structure/chair/fancy/bench/corporate, 1, one_per_turf = TRUE, on_floor = TRUE, time = 20), \
new /datum/stack_recipe("corporate bench (left)", /obj/structure/chair/fancy/bench/corporate/left, 1, one_per_turf = TRUE, on_floor = TRUE, time = 20), \
new /datum/stack_recipe("corporate bench (right)", /obj/structure/chair/fancy/bench/corporate/right, 1, one_per_turf = TRUE, on_floor = TRUE, time = 20), \
>>>>>>> 94c6a7a7ee... Fix for Corporate Benches and Chair deconstruction + Time to build for chairs (#7594)
)),
null, \
new/datum/stack_recipe("rack parts", /obj/item/rack_parts), \
Expand Down Expand Up @@ -196,6 +240,7 @@ GLOBAL_LIST_INIT(plasteel_recipes, list ( \
* Wood
*/
GLOBAL_LIST_INIT(wood_recipes, list ( \
<<<<<<< HEAD
new/datum/stack_recipe("wooden sandals", /obj/item/clothing/shoes/sandal, 1), \
new/datum/stack_recipe("wood floor tile", /obj/item/stack/tile/wood, 1, 4, 20), \
new/datum/stack_recipe("wood table frame", /obj/structure/table_frame/wood, 2, time = 10), \
Expand Down Expand Up @@ -229,6 +274,41 @@ GLOBAL_LIST_INIT(wood_recipes, list ( \
new /datum/stack_recipe("pew (middle)", /obj/structure/chair/pew, 3, one_per_turf = TRUE, on_floor = TRUE),
new /datum/stack_recipe("pew (left)", /obj/structure/chair/pew/left, 3, one_per_turf = TRUE, on_floor = TRUE),
new /datum/stack_recipe("pew (right)", /obj/structure/chair/pew/right, 3, one_per_turf = TRUE, on_floor = TRUE)
=======
new/datum/stack_recipe("wooden sandals", /obj/item/clothing/shoes/sandal, 1), \
new/datum/stack_recipe("wood floor tile", /obj/item/stack/tile/wood, 1, 4, 20), \
new/datum/stack_recipe("wood table frame", /obj/structure/table_frame/wood, 2, time = 10), \
new/datum/stack_recipe("rifle stock", /obj/item/weaponcrafting/stock, 10, time = 40), \
new/datum/stack_recipe("rolling pin", /obj/item/kitchen/rollingpin, 2, time = 30), \
new/datum/stack_recipe("wooden chair", /obj/structure/chair/wood/, 3, time = 20, one_per_turf = TRUE, on_floor = TRUE), \
new/datum/stack_recipe("winged wooden chair", /obj/structure/chair/wood/wings, 3, time = 30, one_per_turf = TRUE, on_floor = TRUE), \
new/datum/stack_recipe("wooden barricade", /obj/structure/barricade/wooden, 5, time = 50, one_per_turf = TRUE, on_floor = TRUE), \
new/datum/stack_recipe("wooden door", /obj/structure/mineral_door/wood, 10, time = 20, one_per_turf = TRUE, on_floor = TRUE), \
new/datum/stack_recipe("coffin", /obj/structure/closet/crate/coffin, 5, time = 15, one_per_turf = TRUE, on_floor = TRUE), \
new/datum/stack_recipe("book case", /obj/structure/bookcase, 4, time = 15, one_per_turf = TRUE, on_floor = TRUE), \
new/datum/stack_recipe("drying rack", /obj/machinery/smartfridge/drying_rack, 10, time = 15, one_per_turf = TRUE, on_floor = TRUE), \
new/datum/stack_recipe("dog bed", /obj/structure/bed/dogbed, 10, time = 10, one_per_turf = TRUE, on_floor = TRUE), \
new/datum/stack_recipe("dresser", /obj/structure/dresser, 10, time = 15, one_per_turf = TRUE, on_floor = TRUE), \
new/datum/stack_recipe("picture frame", /obj/item/wallframe/picture, 1, time = 10),\
new/datum/stack_recipe("painting frame", /obj/item/wallframe/painting, 1, time = 10),\
new/datum/stack_recipe("display case chassis", /obj/structure/displaycase_chassis, 5, one_per_turf = TRUE, on_floor = TRUE), \
new/datum/stack_recipe("easel", /obj/structure/easel, 5, time = 10, one_per_turf = TRUE, on_floor = TRUE), \
new/datum/stack_recipe("wooden buckler", /obj/item/shield/riot/buckler, 20, time = 40), \
new/datum/stack_recipe("apiary", /obj/structure/beebox, 40, time = 50),\
new/datum/stack_recipe("tiki mask", /obj/item/clothing/mask/gas/tiki_mask, 2), \
new/datum/stack_recipe("honey frame", /obj/item/honey_frame, 5, time = 10),\
new/datum/stack_recipe("ore box", /obj/structure/ore_box, 4, time = 50, one_per_turf = TRUE, on_floor = TRUE),\
new/datum/stack_recipe("wooden crate", /obj/structure/closet/crate/wooden, 6, time = 50, one_per_turf = TRUE, on_floor = TRUE),\
new/datum/stack_recipe("baseball bat", /obj/item/melee/baseball_bat, 5, time = 15),\
new/datum/stack_recipe("loom", /obj/structure/loom, 10, time = 15, one_per_turf = TRUE, on_floor = TRUE), \
new/datum/stack_recipe("mortar", /obj/item/reagent_containers/glass/mortar, 3), \
new/datum/stack_recipe("firebrand", /obj/item/match/firebrand, 2, time = 100), \
null, \
new/datum/stack_recipe_list("pews", list(
new /datum/stack_recipe("pew (middle)", /obj/structure/chair/fancy/bench/pew, 3, one_per_turf = TRUE, on_floor = TRUE, time = 20),
new /datum/stack_recipe("pew (left)", /obj/structure/chair/fancy/bench/pew/left, 3, one_per_turf = TRUE, on_floor = TRUE, time = 20),
new /datum/stack_recipe("pew (right)", /obj/structure/chair/fancy/bench/pew/right, 3, one_per_turf = TRUE, on_floor = TRUE, time = 20)
>>>>>>> 94c6a7a7ee... Fix for Corporate Benches and Chair deconstruction + Time to build for chairs (#7594)
)),
null, \
))
Expand Down Expand Up @@ -642,7 +722,11 @@ GLOBAL_LIST_INIT(bronze_recipes, list ( \
new/datum/stack_recipe("bronze suit", /obj/item/clothing/suit/bronze), \
new/datum/stack_recipe("bronze boots", /obj/item/clothing/shoes/bronze), \
null,
<<<<<<< HEAD
new/datum/stack_recipe("bronze chair", /obj/structure/chair/bronze, 1, time = 0, one_per_turf = TRUE, on_floor = TRUE), \
=======
new/datum/stack_recipe("bronze chair", /obj/structure/chair/fancy/brass/bronze, 1, time = 40, one_per_turf = TRUE, on_floor = TRUE), \
>>>>>>> 94c6a7a7ee... Fix for Corporate Benches and Chair deconstruction + Time to build for chairs (#7594)
))

/obj/item/stack/tile/bronze
Expand Down Expand Up @@ -717,10 +801,19 @@ GLOBAL_LIST_INIT(bronze_recipes, list ( \
merge_type = /obj/item/stack/sheet/bone

GLOBAL_LIST_INIT(plastic_recipes, list(
<<<<<<< HEAD
new /datum/stack_recipe("plastic flaps", /obj/structure/plasticflaps, 5, one_per_turf = TRUE, on_floor = TRUE, time = 40), \
new /datum/stack_recipe("water bottle", /obj/item/reagent_containers/glass/waterbottle/empty), \
new /datum/stack_recipe("large water bottle", /obj/item/reagent_containers/glass/waterbottle/large/empty,3), \
new /datum/stack_recipe("wet floor sign", /obj/item/clothing/suit/caution, 2)))
=======
new /datum/stack_recipe("plastic flaps", /obj/structure/plasticflaps, 5, one_per_turf = TRUE, on_floor = TRUE, time = 40), \
new /datum/stack_recipe("water bottle", /obj/item/reagent_containers/glass/waterbottle/empty), \
new /datum/stack_recipe("large water bottle", /obj/item/reagent_containers/glass/waterbottle/large/empty,3), \
new /datum/stack_recipe("wet floor sign", /obj/item/clothing/suit/caution, 2), \
new /datum/stack_recipe("plastic chair", /obj/structure/chair/fancy/plastic, one_per_turf = TRUE, on_floor = TRUE, time = 20), \
))
>>>>>>> 94c6a7a7ee... Fix for Corporate Benches and Chair deconstruction + Time to build for chairs (#7594)

/obj/item/stack/sheet/plastic
name = "plastic"
Expand Down
Loading