Sprites, Tweaks, and Snacks
-Fixes Trash Can recipie. Now craftable with 10 metal, removed with welder. -Adds an additional sprite for Duke Purple Tea so Tea and Coco don't look the same. -Adds Bacon and Eggs Sprite and Food Item -Adds Unique Sprite for Drying Agent bottle. -Adds Chocolate Bar to the... Chocolate Vendor. -Allows Trash Bag to fit Limbs (Not Heads) -Allows Mops to be Printable -Allows Bio Bags to pick up Limbs and Organs. Disallows Cybernetics, Brains, and Implants. Ports the following from TG: Printable Mops https://github.com/tgstation/tgstation/pull/44141 Makes Limbs Small Weight (To Fit in Trashbags) https://github.com/tgstation/tgstation/pull/44730
@@ -51,6 +51,7 @@ GLOBAL_LIST_INIT(metal_recipes, list ( \
|
||||
new/datum/stack_recipe("closet", /obj/structure/closet, 2, time = 15, one_per_turf = TRUE, on_floor = TRUE), \
|
||||
null, \
|
||||
new/datum/stack_recipe("canister", /obj/machinery/portable_atmospherics/canister, 10, time = 15, one_per_turf = TRUE, on_floor = TRUE), \
|
||||
new/datum/stack_recipe("trash bin", /obj/structure/closet/crate/bin, 10, time = 15, one_per_turf = TRUE, on_floor = TRUE),\
|
||||
null, \
|
||||
new/datum/stack_recipe("floor tile", /obj/item/stack/tile/plasteel, 1, 4, 20), \
|
||||
new/datum/stack_recipe("metal rod", /obj/item/stack/rods, 1, 2, 60), \
|
||||
@@ -719,7 +720,6 @@ GLOBAL_LIST_INIT(plastic_recipes, list(
|
||||
new /datum/stack_recipe("opaque plastic flaps", /obj/structure/plasticflaps/opaque, 5, one_per_turf = TRUE, on_floor = TRUE, time = 40), \
|
||||
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 trash cart", /obj/structure/closet/crate/bin,50),\
|
||||
new /datum/stack_recipe("wet floor sign", /obj/item/caution, 2)))
|
||||
|
||||
/obj/item/stack/sheet/plastic
|
||||
|
||||
@@ -399,10 +399,12 @@
|
||||
/obj/item/storage/bag/bio/ComponentInitialize()
|
||||
. = ..()
|
||||
var/datum/component/storage/STR = GetComponent(/datum/component/storage)
|
||||
STR.max_w_class = WEIGHT_CLASS_NORMAL //Allows you to pick up Lungs, Liver, and Stomach
|
||||
STR.max_combined_w_class = 200
|
||||
STR.max_items = 25
|
||||
STR.insert_preposition = "in"
|
||||
STR.can_hold = typecacheof(list(/obj/item/slime_extract, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/glass/beaker, /obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/blood, /obj/item/reagent_containers/hypospray/medipen, /obj/item/reagent_containers/food/snacks/deadmouse, /obj/item/reagent_containers/food/snacks/monkeycube))
|
||||
STR.can_hold = typecacheof(list(/obj/item/slime_extract, /obj/item/reagent_containers/syringe, /obj/item/reagent_containers/glass/beaker, /obj/item/reagent_containers/glass/bottle, /obj/item/reagent_containers/blood, /obj/item/reagent_containers/hypospray/medipen, /obj/item/reagent_containers/food/snacks/deadmouse, /obj/item/reagent_containers/food/snacks/monkeycube, /obj/item/organ, /obj/item/reagent_containers/food/snacks/meat/slab, /obj/item/bodypart))
|
||||
STR.cant_hold = typecacheof(list(/obj/item/organ/brain, /obj/item/organ/liver/cybernetic, /obj/item/organ/heart/cybernetic, /obj/item/organ/lungs/cybernetic, /obj/item/organ/tongue/cybernetic, /obj/item/organ/ears/cybernetic, /obj/item/organ/eyes/robotic, /obj/item/organ/cyberimp))
|
||||
|
||||
/obj/item/storage/bag/bio/holding
|
||||
name = "bio bag of holding"
|
||||
|
||||
@@ -4,8 +4,8 @@
|
||||
icon_state = "largebins"
|
||||
open_sound = 'sound/effects/bin_open.ogg'
|
||||
close_sound = 'sound/effects/bin_close.ogg'
|
||||
material_drop = /obj/item/stack/sheet/plastic
|
||||
material_drop_amount = 40
|
||||
material_drop = /obj/item/stack/sheet/metal
|
||||
material_drop_amount = 10
|
||||
anchored = TRUE
|
||||
horizontal = FALSE
|
||||
delivery_icon = null
|
||||
|
||||
@@ -222,12 +222,18 @@
|
||||
item_state = "coffee"
|
||||
spillable = TRUE
|
||||
|
||||
/obj/item/reagent_containers/food/drinks/mug/on_reagent_change(changetype)
|
||||
/obj/item/reagent_containers/food/drinks/mug/tea/on_reagent_change(changetype)
|
||||
if(reagents.total_volume)
|
||||
icon_state = "tea"
|
||||
else
|
||||
icon_state = "tea_empty"
|
||||
|
||||
/obj/item/reagent_containers/food/drinks/mug/coco/on_reagent_change(changetype)
|
||||
if(reagents.total_volume)
|
||||
icon_state = "coco"
|
||||
else
|
||||
icon_state = "tea_empty"
|
||||
|
||||
/obj/item/reagent_containers/food/drinks/mug/tea
|
||||
name = "Duke Purple tea"
|
||||
desc = "An insult to Duke Purple is an insult to the Space Queen! Any proper gentleman will fight you, if you sully this tea."
|
||||
|
||||
@@ -96,6 +96,16 @@
|
||||
tastes = list("egg" = 4, "salt" = 1, "pepper" = 1)
|
||||
foodtype = MEAT | FRIED | BREAKFAST
|
||||
|
||||
/obj/item/reagent_containers/food/snacks/baconegg
|
||||
name = "bacon and eggs"
|
||||
desc = "A fried egg with a side of bacon. Delicious!"
|
||||
icon_state = "baconegg"
|
||||
bonus_reagents = list(/datum/reagent/consumable/nutriment = 1, /datum/reagent/consumable/nutriment/vitamin = 1)
|
||||
bitesize = 1
|
||||
filling_color = "#FFFFF0"
|
||||
tastes = list("egg" = 2, "bacon" = 2, "salt" = 1, "pepper" = 1)
|
||||
foodtype = MEAT | FRIED | BREAKFAST
|
||||
|
||||
/obj/item/reagent_containers/food/snacks/boiledegg
|
||||
name = "boiled egg"
|
||||
desc = "A hard boiled egg."
|
||||
|
||||
@@ -13,6 +13,15 @@
|
||||
result = /obj/item/reagent_containers/food/snacks/friedegg
|
||||
subcategory = CAT_EGG
|
||||
|
||||
/datum/crafting_recipe/food/baconegg
|
||||
name = "Bacon and Eggs"
|
||||
reqs = list(
|
||||
/obj/item/reagent_containers/food/snacks/friedegg = 1,
|
||||
/obj/item/reagent_containers/food/snacks/meat/bacon = 1
|
||||
)
|
||||
result = /obj/item/reagent_containers/food/snacks/baconegg
|
||||
subcategory = CAT_EGG
|
||||
|
||||
/datum/crafting_recipe/food/omelette
|
||||
name = "Omelette"
|
||||
reqs = list(
|
||||
|
||||
@@ -172,6 +172,7 @@
|
||||
/obj/item/reagent_containers/spray/drying_agent
|
||||
name = "drying agent spray"
|
||||
desc = "A spray bottle for drying agent."
|
||||
icon_state = "cleaner_drying"
|
||||
volume = 100
|
||||
list_reagents = list(/datum/reagent/drying_agent = 100)
|
||||
amount_per_transfer_from_this = 2
|
||||
|
||||
@@ -289,6 +289,16 @@
|
||||
////////////Janitor Designs//////////////
|
||||
/////////////////////////////////////////
|
||||
|
||||
/datum/design/mop
|
||||
name = "Mop"
|
||||
desc = "Just your everyday standard mop."
|
||||
id = "mop"
|
||||
build_type = PROTOLATHE
|
||||
materials = list(MAT_METAL = 1200, MAT_GLASS = 100)
|
||||
build_path = /obj/item/mop
|
||||
category = list("Equipment")
|
||||
departmental_flags = DEPARTMENTAL_FLAG_SERVICE
|
||||
|
||||
/datum/design/advmop
|
||||
name = "Advanced Mop"
|
||||
desc = "An upgraded mop with a large internal capacity for holding water or other cleaning chemicals."
|
||||
|
||||
@@ -602,7 +602,7 @@
|
||||
display_name = "Basic Tools"
|
||||
description = "Basic mechanical, electronic, surgical and botanical tools."
|
||||
prereq_ids = list("base")
|
||||
design_ids = list("screwdriver", "wrench", "wirecutters", "crowbar", "multitool", "welding_tool", "tscanner", "analyzer", "cable_coil", "pipe_painter", "airlock_painter", "scalpel", "circular_saw", "surgicaldrill", "retractor", "cautery", "hemostat", "cultivator", "plant_analyzer", "shovel", "spade", "hatchet")
|
||||
design_ids = list("screwdriver", "wrench", "wirecutters", "crowbar", "multitool", "welding_tool", "tscanner", "analyzer", "cable_coil", "pipe_painter", "airlock_painter", "scalpel", "circular_saw", "surgicaldrill", "retractor", "cautery", "hemostat", "cultivator", "plant_analyzer", "shovel", "spade", "hatchet", "mop")
|
||||
research_costs = list(TECHWEB_POINT_TYPE_GENERIC = 500)
|
||||
export_price = 5000
|
||||
|
||||
|
||||
@@ -5,6 +5,7 @@
|
||||
force = 3
|
||||
throwforce = 3
|
||||
icon = 'icons/mob/human_parts.dmi'
|
||||
w_class = WEIGHT_CLASS_SMALL
|
||||
icon_state = ""
|
||||
layer = BELOW_MOB_LAYER //so it isn't hidden behind objects when on the floor
|
||||
var/mob/living/carbon/owner = null
|
||||
|
||||
@@ -5,21 +5,24 @@
|
||||
product_ads = "The healthiest!;Award-winning chocolate bars!;Mmm! So good!;Oh my god it's so juicy!;Have a snack.;Snacks are good for you!;Have some more Getmore!;Best quality snacks straight from mars.;We love chocolate!;Try our new jerky!"
|
||||
icon_state = "snack"
|
||||
products = list(/obj/item/reagent_containers/food/snacks/candy = 6,
|
||||
/obj/item/reagent_containers/food/snacks/chocolatebar = 6,
|
||||
/obj/item/reagent_containers/food/drinks/dry_ramen = 6,
|
||||
/obj/item/reagent_containers/food/snacks/chips = 6,
|
||||
/obj/item/reagent_containers/food/snacks/sosjerky = 6,
|
||||
/obj/item/reagent_containers/food/snacks/no_raisin = 6,
|
||||
/obj/item/reagent_containers/food/snacks/spacetwinkie = 6,
|
||||
/obj/item/reagent_containers/food/snacks/cheesiehonkers = 6)
|
||||
/obj/item/reagent_containers/food/snacks/cheesiehonkers = 6,
|
||||
/obj/item/reagent_containers/food/snacks/cornchips = 6)
|
||||
contraband = list(
|
||||
/obj/item/reagent_containers/food/snacks/cracker = 12,
|
||||
/obj/item/reagent_containers/food/snacks/beans = 2,
|
||||
/obj/item/reagent_containers/food/snacks/honeybar = 6,
|
||||
/obj/item/reagent_containers/food/snacks/syndicake = 6)
|
||||
/obj/item/reagent_containers/food/snacks/syndicake = 6,
|
||||
/obj/item/reagent_containers/food/snacks/beans = 2)
|
||||
premium = list(
|
||||
/obj/item/reagent_containers/food/snacks/lollipop = 2,
|
||||
/obj/item/reagent_containers/food/snacks/spiderlollipop = 2,
|
||||
/obj/item/reagent_containers/food/snacks/chococoin = 1,
|
||||
/obj/item/storage/box/marshmallow = 1,
|
||||
/obj/item/storage/box/donkpockets = 2)
|
||||
|
||||
refill_canister = /obj/item/vending_refill/snack
|
||||
|
||||
|
Before Width: | Height: | Size: 89 KiB After Width: | Height: | Size: 89 KiB |
|
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 11 KiB |
|
Before Width: | Height: | Size: 70 KiB After Width: | Height: | Size: 70 KiB |
|
Before Width: | Height: | Size: 26 KiB After Width: | Height: | Size: 26 KiB |