mirror of
https://github.com/CHOMPStation2/CHOMPStation2.git
synced 2026-08-24 13:47:33 +01:00
Merge remote-tracking branch 'upstream/master'
This commit is contained in:
Hawk_v3
@@ -8,9 +8,12 @@ var/datum/category_collection/autolathe/autolathe_recipes
|
||||
for(var/material in I.matter)
|
||||
var/coeff = (no_scale ? 1 : 1.25) //most objects are more expensive to produce than to recycle
|
||||
resources[material] = I.matter[material]*coeff // but if it's a sheet or RCD cartridge, it's 1:1
|
||||
if(is_stack && istype(I, /obj/item/stack))
|
||||
var/obj/item/stack/IS = I
|
||||
max_stack = IS.max_amount
|
||||
if(is_stack)
|
||||
if(istype(I, /obj/item/stack))
|
||||
var/obj/item/stack/IS = I
|
||||
max_stack = IS.max_amount
|
||||
else
|
||||
max_stack = 10
|
||||
qdel(I)
|
||||
|
||||
/****************************
|
||||
@@ -65,7 +68,7 @@ var/datum/category_collection/autolathe/autolathe_recipes
|
||||
var/list/resources
|
||||
var/hidden
|
||||
var/power_use = 0
|
||||
var/is_stack
|
||||
var/is_stack // Creates multiple of an item if applied to non-stack items
|
||||
var/max_stack
|
||||
var/no_scale
|
||||
|
||||
|
||||
@@ -105,10 +105,12 @@
|
||||
/datum/category_item/autolathe/general/tube
|
||||
name = "light tube"
|
||||
path =/obj/item/weapon/light/tube
|
||||
is_stack = TRUE
|
||||
|
||||
/datum/category_item/autolathe/general/bulb
|
||||
name = "light bulb"
|
||||
path =/obj/item/weapon/light/bulb
|
||||
is_stack = TRUE
|
||||
|
||||
/datum/category_item/autolathe/general/ashtray_glass
|
||||
name = "glass ashtray"
|
||||
|
||||
@@ -126,7 +126,7 @@ var/global/datum/controller/gameticker/ticker
|
||||
create_characters() //Create player characters and transfer them.
|
||||
collect_minds()
|
||||
equip_characters()
|
||||
data_core.manifest()
|
||||
//data_core.manifest() //VOREStation Removal
|
||||
|
||||
callHook("roundstart")
|
||||
|
||||
@@ -280,8 +280,13 @@ var/global/datum/controller/gameticker/ticker
|
||||
else if(!player.mind.assigned_role)
|
||||
continue
|
||||
else
|
||||
if (player.create_character()) // VOREStation Edit
|
||||
//VOREStation Edit Start
|
||||
var/mob/living/carbon/human/new_char = player.create_character()
|
||||
if(new_char)
|
||||
qdel(player)
|
||||
if(istype(new_char))
|
||||
data_core.manifest_inject(new_char)
|
||||
//VOREStation Edit End
|
||||
|
||||
|
||||
proc/collect_minds()
|
||||
|
||||
@@ -277,9 +277,13 @@
|
||||
|
||||
//Create the desired item.
|
||||
var/obj/item/I = new making.path(src.loc)
|
||||
if(multiplier > 1 && istype(I, /obj/item/stack))
|
||||
var/obj/item/stack/S = I
|
||||
S.amount = multiplier
|
||||
if(multiplier > 1)
|
||||
if(istype(I, /obj/item/stack))
|
||||
var/obj/item/stack/S = I
|
||||
S.amount = multiplier
|
||||
else
|
||||
for(multiplier; multiplier > 1; --multiplier) // Create multiple items if it's not a stack.
|
||||
new making.path(src.loc)
|
||||
|
||||
updateUsrDialog()
|
||||
|
||||
|
||||
@@ -28,7 +28,7 @@
|
||||
|
||||
if(N == /turf/space)
|
||||
var/turf/below = GetBelow(src)
|
||||
if(istype(below) && (air_master.has_valid_zone(below) || air_master.has_valid_zone(src)))
|
||||
if(istype(below) && (air_master.has_valid_zone(below) || air_master.has_valid_zone(src)) && !istype(below, /turf/unsimulated/wall)) // VOREStation Edit: Weird open space
|
||||
N = /turf/simulated/open
|
||||
|
||||
var/obj/fire/old_fire = fire
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
desc = "Magnetic boots, often used during extravehicular activity to ensure the user remains safely attached to the vehicle. They're large enough to be worn over other footwear."
|
||||
name = "magboots"
|
||||
icon_state = "magboots0"
|
||||
item_flags = PHORONGUARD
|
||||
item_state_slots = list(slot_r_hand_str = "magboots", slot_l_hand_str = "magboots")
|
||||
species_restricted = null
|
||||
force = 3
|
||||
|
||||
@@ -23,7 +23,7 @@
|
||||
|
||||
/obj/item/clothing/gloves/gauntlets/rig
|
||||
name = "gauntlets"
|
||||
item_flags = THICKMATERIAL
|
||||
item_flags = THICKMATERIAL|PHORONGUARD
|
||||
body_parts_covered = HANDS
|
||||
heat_protection = HANDS
|
||||
cold_protection = HANDS
|
||||
|
||||
@@ -90,13 +90,6 @@ I said no!
|
||||
)
|
||||
result = /obj/item/weapon/reagent_containers/food/snacks/monkeyburger
|
||||
|
||||
/datum/recipe/syntiburger
|
||||
items = list(
|
||||
/obj/item/weapon/reagent_containers/food/snacks/bun,
|
||||
/obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh
|
||||
)
|
||||
result = /obj/item/weapon/reagent_containers/food/snacks/monkeyburger
|
||||
|
||||
/datum/recipe/brainburger
|
||||
items = list(
|
||||
/obj/item/weapon/reagent_containers/food/snacks/bun,
|
||||
@@ -214,20 +207,6 @@ I said no!
|
||||
)
|
||||
result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/meatbread
|
||||
|
||||
/datum/recipe/syntibread
|
||||
items = list(
|
||||
/obj/item/weapon/reagent_containers/food/snacks/dough,
|
||||
/obj/item/weapon/reagent_containers/food/snacks/dough,
|
||||
/obj/item/weapon/reagent_containers/food/snacks/dough,
|
||||
/obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh,
|
||||
/obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh,
|
||||
/obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh,
|
||||
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge,
|
||||
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge,
|
||||
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge,
|
||||
)
|
||||
result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/meatbread
|
||||
|
||||
/datum/recipe/xenomeatbread
|
||||
items = list(
|
||||
/obj/item/weapon/reagent_containers/food/snacks/dough,
|
||||
@@ -353,19 +332,11 @@ I said no!
|
||||
)
|
||||
result = /obj/item/weapon/reagent_containers/food/snacks/human/kabob
|
||||
|
||||
/datum/recipe/monkeykabob
|
||||
/datum/recipe/kabob //Do not put before humankabob
|
||||
items = list(
|
||||
/obj/item/stack/rods,
|
||||
/obj/item/weapon/reagent_containers/food/snacks/meat/monkey,
|
||||
/obj/item/weapon/reagent_containers/food/snacks/meat/monkey,
|
||||
)
|
||||
result = /obj/item/weapon/reagent_containers/food/snacks/monkeykabob
|
||||
|
||||
/datum/recipe/syntikabob
|
||||
items = list(
|
||||
/obj/item/stack/rods,
|
||||
/obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh,
|
||||
/obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh,
|
||||
/obj/item/weapon/reagent_containers/food/snacks/meat,
|
||||
/obj/item/weapon/reagent_containers/food/snacks/meat,
|
||||
)
|
||||
result = /obj/item/weapon/reagent_containers/food/snacks/monkeykabob
|
||||
|
||||
@@ -477,11 +448,6 @@ I said no!
|
||||
items = list(/obj/item/weapon/reagent_containers/food/snacks/meat)
|
||||
result = /obj/item/weapon/reagent_containers/food/snacks/meatsteak
|
||||
|
||||
/datum/recipe/syntisteak
|
||||
reagents = list("sodiumchloride" = 1, "blackpepper" = 1)
|
||||
items = list(/obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh)
|
||||
result = /obj/item/weapon/reagent_containers/food/snacks/meatsteak
|
||||
|
||||
/datum/recipe/pizzamargherita
|
||||
fruit = list("tomato" = 1)
|
||||
items = list(
|
||||
@@ -513,17 +479,6 @@ I said no!
|
||||
)
|
||||
result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/meatpizza
|
||||
|
||||
/datum/recipe/syntipizza
|
||||
fruit = list("tomato" = 1)
|
||||
items = list(
|
||||
/obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough,
|
||||
/obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh,
|
||||
/obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh,
|
||||
/obj/item/weapon/reagent_containers/food/snacks/meat/syntiflesh,
|
||||
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge
|
||||
)
|
||||
result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/meatpizza
|
||||
|
||||
/datum/recipe/mushroompizza
|
||||
fruit = list("mushroom" = 5, "tomato" = 1)
|
||||
items = list(
|
||||
|
||||
@@ -3,9 +3,9 @@
|
||||
name = "chili"
|
||||
seed_name = "chili"
|
||||
display_name = "chili plants"
|
||||
kitchen_tag = "chili"
|
||||
chems = list("capsaicin" = list(3,5), "nutriment" = list(1,25))
|
||||
mutants = list("icechili")
|
||||
kitchen_tag = "chili"
|
||||
|
||||
/datum/seed/chili/New()
|
||||
..()
|
||||
@@ -24,9 +24,9 @@
|
||||
name = "icechili"
|
||||
seed_name = "ice pepper"
|
||||
display_name = "ice-pepper plants"
|
||||
kitchen_tag = "icechili"
|
||||
mutants = null
|
||||
chems = list("frostoil" = list(3,5), "nutriment" = list(1,50))
|
||||
kitchen_tag = "icechili"
|
||||
|
||||
/datum/seed/chili/ice/New()
|
||||
..()
|
||||
@@ -39,9 +39,9 @@
|
||||
name = "berries"
|
||||
seed_name = "berry"
|
||||
display_name = "berry bush"
|
||||
kitchen_tag = "berries"
|
||||
mutants = list("glowberries","poisonberries")
|
||||
chems = list("nutriment" = list(1,10), "berryjuice" = list(10,10))
|
||||
kitchen_tag = "berries"
|
||||
|
||||
/datum/seed/berry/New()
|
||||
..()
|
||||
@@ -129,9 +129,9 @@
|
||||
name = "deathnettle"
|
||||
seed_name = "death nettle"
|
||||
display_name = "death nettles"
|
||||
kitchen_tag = "deathnettle"
|
||||
mutants = null
|
||||
chems = list("nutriment" = list(1,50), "pacid" = list(0,1))
|
||||
kitchen_tag = "deathnettle"
|
||||
|
||||
/datum/seed/nettle/death/New()
|
||||
..()
|
||||
@@ -221,9 +221,9 @@
|
||||
name = "eggplant"
|
||||
seed_name = "eggplant"
|
||||
display_name = "eggplants"
|
||||
kitchen_tag = "eggplant"
|
||||
mutants = list("egg-plant")
|
||||
chems = list("nutriment" = list(1,10))
|
||||
kitchen_tag = "eggplant"
|
||||
|
||||
/datum/seed/eggplant/New()
|
||||
..()
|
||||
@@ -243,9 +243,9 @@
|
||||
name = "egg-plant"
|
||||
seed_name = "egg-plant"
|
||||
display_name = "egg-plants"
|
||||
kitchen_tag = "egg-plant"
|
||||
mutants = null
|
||||
chems = list("nutriment" = list(1,5), "egg" = list(3,12))
|
||||
kitchen_tag = "egg-plant"
|
||||
has_item_product = /obj/item/weapon/reagent_containers/food/snacks/egg/purple
|
||||
|
||||
//Apples/varieties.
|
||||
@@ -253,9 +253,9 @@
|
||||
name = "apple"
|
||||
seed_name = "apple"
|
||||
display_name = "apple tree"
|
||||
kitchen_tag = "apple"
|
||||
mutants = list("poisonapple","goldapple")
|
||||
chems = list("nutriment" = list(1,10),"applejuice" = list(10,20))
|
||||
kitchen_tag = "apple"
|
||||
|
||||
/datum/seed/apple/New()
|
||||
..()
|
||||
@@ -279,9 +279,9 @@
|
||||
name = "goldapple"
|
||||
seed_name = "golden apple"
|
||||
display_name = "gold apple tree"
|
||||
kitchen_tag = "goldapple"
|
||||
mutants = null
|
||||
chems = list("nutriment" = list(1,10), "gold" = list(1,5))
|
||||
kitchen_tag = "goldapple"
|
||||
|
||||
/datum/seed/apple/gold/New()
|
||||
..()
|
||||
@@ -296,9 +296,9 @@
|
||||
name = "ambrosia"
|
||||
seed_name = "ambrosia vulgaris"
|
||||
display_name = "ambrosia vulgaris"
|
||||
kitchen_tag = "ambrosia"
|
||||
mutants = list("ambrosiadeus")
|
||||
chems = list("nutriment" = list(1), "space_drugs" = list(1,8), "kelotane" = list(1,8,1), "bicaridine" = list(1,10,1), "toxin" = list(1,10))
|
||||
kitchen_tag = "ambrosia"
|
||||
|
||||
/datum/seed/ambrosia/New()
|
||||
..()
|
||||
@@ -316,9 +316,9 @@
|
||||
name = "ambrosiadeus"
|
||||
seed_name = "ambrosia deus"
|
||||
display_name = "ambrosia deus"
|
||||
kitchen_tag = "ambrosiadeus"
|
||||
mutants = null
|
||||
chems = list("nutriment" = list(1), "bicaridine" = list(1,8), "synaptizine" = list(1,8,1), "hyperzine" = list(1,10,1), "space_drugs" = list(1,10))
|
||||
kitchen_tag = "ambrosiadeus"
|
||||
|
||||
/datum/seed/ambrosia/deus/New()
|
||||
..()
|
||||
@@ -512,8 +512,8 @@
|
||||
name = "harebells"
|
||||
seed_name = "harebell"
|
||||
display_name = "harebells"
|
||||
chems = list("nutriment" = list(1,20))
|
||||
kitchen_tag = "harebell"
|
||||
chems = list("nutriment" = list(1,20))
|
||||
|
||||
/datum/seed/flower/New()
|
||||
..()
|
||||
@@ -530,8 +530,8 @@
|
||||
name = "poppies"
|
||||
seed_name = "poppy"
|
||||
display_name = "poppies"
|
||||
chems = list("nutriment" = list(1,20), "bicaridine" = list(1,10))
|
||||
kitchen_tag = "poppy"
|
||||
chems = list("nutriment" = list(1,20), "bicaridine" = list(1,10))
|
||||
|
||||
/datum/seed/flower/poppy/New()
|
||||
..()
|
||||
@@ -621,6 +621,7 @@
|
||||
name = "grapes"
|
||||
seed_name = "grape"
|
||||
display_name = "grapevines"
|
||||
kitchen_tag = "grapes"
|
||||
mutants = list("greengrapes")
|
||||
chems = list("nutriment" = list(1,10), "sugar" = list(1,5), "grapejuice" = list(10,10))
|
||||
|
||||
@@ -654,8 +655,8 @@
|
||||
name = "lettuce"
|
||||
seed_name = "lettuce"
|
||||
display_name = "lettuce"
|
||||
chems = list("nutriment" = list(1,15))
|
||||
kitchen_tag = "cabbage"
|
||||
chems = list("nutriment" = list(1,15))
|
||||
|
||||
/datum/seed/lettuce/New()
|
||||
..()
|
||||
@@ -676,8 +677,8 @@
|
||||
name = "siflettuce"
|
||||
seed_name = "glacial lettuce"
|
||||
display_name = "glacial lettuce"
|
||||
chems = list("nutriment" = list(1,5), "paracetamol" = list(0,2))
|
||||
kitchen_tag = "icelettuce"
|
||||
chems = list("nutriment" = list(1,5), "paracetamol" = list(0,2))
|
||||
|
||||
/datum/seed/lettuce/ice/New()
|
||||
..()
|
||||
@@ -744,8 +745,8 @@
|
||||
name = "peanut"
|
||||
seed_name = "peanut"
|
||||
display_name = "peanut vines"
|
||||
chems = list("nutriment" = list(1,10), "peanutoil" = list(1,3))
|
||||
kitchen_tag = "peanut"
|
||||
chems = list("nutriment" = list(1,10), "peanutoil" = list(1,3))
|
||||
|
||||
/datum/seed/peanuts/New()
|
||||
..()
|
||||
@@ -763,6 +764,7 @@
|
||||
name = "vanilla"
|
||||
seed_name = "vanilla"
|
||||
display_name = "vanilla"
|
||||
kitchen_tag = "vanilla"
|
||||
chems = list("nutriment" = list(1,10), "vanilla" = list(0,3), "sugar" = list(0, 1))
|
||||
|
||||
/datum/seed/vanilla/New()
|
||||
@@ -782,8 +784,8 @@
|
||||
name = "cabbage"
|
||||
seed_name = "cabbage"
|
||||
display_name = "cabbages"
|
||||
chems = list("nutriment" = list(1,10))
|
||||
kitchen_tag = "cabbage"
|
||||
chems = list("nutriment" = list(1,10))
|
||||
|
||||
/datum/seed/cabbage/New()
|
||||
..()
|
||||
@@ -804,9 +806,9 @@
|
||||
name = "banana"
|
||||
seed_name = "banana"
|
||||
display_name = "banana tree"
|
||||
kitchen_tag = "banana"
|
||||
chems = list("banana" = list(10,10))
|
||||
trash_type = /obj/item/weapon/bananapeel
|
||||
kitchen_tag = "banana"
|
||||
|
||||
/datum/seed/banana/New()
|
||||
..()
|
||||
@@ -826,8 +828,8 @@
|
||||
name = "corn"
|
||||
seed_name = "corn"
|
||||
display_name = "ears of corn"
|
||||
chems = list("nutriment" = list(1,10), "cornoil" = list(1,10))
|
||||
kitchen_tag = "corn"
|
||||
chems = list("nutriment" = list(1,10), "cornoil" = list(1,10))
|
||||
trash_type = /obj/item/weapon/corncob
|
||||
|
||||
/datum/seed/corn/New()
|
||||
@@ -848,8 +850,8 @@
|
||||
name = "potato"
|
||||
seed_name = "potato"
|
||||
display_name = "potatoes"
|
||||
chems = list("nutriment" = list(1,10), "potatojuice" = list(10,10))
|
||||
kitchen_tag = "potato"
|
||||
chems = list("nutriment" = list(1,10), "potatojuice" = list(10,10))
|
||||
|
||||
/datum/seed/potato/New()
|
||||
..()
|
||||
@@ -867,8 +869,8 @@
|
||||
name = "onion"
|
||||
seed_name = "onion"
|
||||
display_name = "onions"
|
||||
chems = list("nutriment" = list(1,10))
|
||||
kitchen_tag = "onion"
|
||||
chems = list("nutriment" = list(1,10))
|
||||
|
||||
/datum/seed/onion/New()
|
||||
..()
|
||||
@@ -885,8 +887,8 @@
|
||||
name = "soybean"
|
||||
seed_name = "soybean"
|
||||
display_name = "soybeans"
|
||||
chems = list("nutriment" = list(1,20), "soymilk" = list(10,20))
|
||||
kitchen_tag = "soybeans"
|
||||
chems = list("nutriment" = list(1,20), "soymilk" = list(10,20))
|
||||
|
||||
/datum/seed/soybean/New()
|
||||
..()
|
||||
@@ -903,8 +905,8 @@
|
||||
name = "wheat"
|
||||
seed_name = "wheat"
|
||||
display_name = "wheat stalks"
|
||||
chems = list("nutriment" = list(1,25), "flour" = list(15,15))
|
||||
kitchen_tag = "wheat"
|
||||
chems = list("nutriment" = list(1,25), "flour" = list(15,15))
|
||||
|
||||
/datum/seed/wheat/New()
|
||||
..()
|
||||
@@ -923,8 +925,8 @@
|
||||
name = "rice"
|
||||
seed_name = "rice"
|
||||
display_name = "rice stalks"
|
||||
chems = list("nutriment" = list(1,25), "rice" = list(10,15))
|
||||
kitchen_tag = "rice"
|
||||
chems = list("nutriment" = list(1,25), "rice" = list(10,15))
|
||||
|
||||
/datum/seed/rice/New()
|
||||
..()
|
||||
@@ -943,8 +945,8 @@
|
||||
name = "carrot"
|
||||
seed_name = "carrot"
|
||||
display_name = "carrots"
|
||||
chems = list("nutriment" = list(1,20), "imidazoline" = list(3,5), "carrotjuice" = list(10,20))
|
||||
kitchen_tag = "carrot"
|
||||
chems = list("nutriment" = list(1,20), "imidazoline" = list(3,5), "carrotjuice" = list(10,20))
|
||||
|
||||
/datum/seed/carrots/New()
|
||||
..()
|
||||
@@ -978,8 +980,8 @@
|
||||
name = "whitebeet"
|
||||
seed_name = "white-beet"
|
||||
display_name = "white-beets"
|
||||
chems = list("nutriment" = list(0,20), "sugar" = list(1,5))
|
||||
kitchen_tag = "whitebeet"
|
||||
chems = list("nutriment" = list(0,20), "sugar" = list(1,5))
|
||||
|
||||
/datum/seed/whitebeets/New()
|
||||
..()
|
||||
@@ -997,6 +999,7 @@
|
||||
name = "sugarcane"
|
||||
seed_name = "sugarcane"
|
||||
display_name = "sugarcanes"
|
||||
kitchen_tag = "sugarcanes"
|
||||
chems = list("sugar" = list(4,5))
|
||||
|
||||
/datum/seed/sugarcane/New()
|
||||
@@ -1016,8 +1019,8 @@
|
||||
name = "rhubarb"
|
||||
seed_name = "rhubarb"
|
||||
display_name = "rhubarb"
|
||||
chems = list("nutriment" = list(1,15))
|
||||
kitchen_tag = "rhubarb"
|
||||
chems = list("nutriment" = list(1,15))
|
||||
|
||||
/datum/seed/rhubarb/New()
|
||||
..()
|
||||
@@ -1034,8 +1037,8 @@
|
||||
name = "celery"
|
||||
seed_name = "celery"
|
||||
display_name = "celery"
|
||||
chems = list("nutriment" = list(5,20))
|
||||
kitchen_tag = "celery"
|
||||
chems = list("nutriment" = list(5,20))
|
||||
|
||||
/datum/seed/celery/New()
|
||||
..()
|
||||
@@ -1052,8 +1055,8 @@
|
||||
name = "spineapple"
|
||||
seed_name = "spineapple"
|
||||
display_name = "spineapple"
|
||||
chems = list("nutriment" = list(1,5), "enzyme" = list(1,5), "pineapplejuice" = list(1, 20))
|
||||
kitchen_tag = "pineapple"
|
||||
chems = list("nutriment" = list(1,5), "enzyme" = list(1,5), "pineapplejuice" = list(1, 20))
|
||||
|
||||
/datum/seed/spineapple/New()
|
||||
..()
|
||||
@@ -1076,8 +1079,8 @@
|
||||
seed_name = "durian"
|
||||
seed_noun = "pits"
|
||||
display_name = "durian"
|
||||
chems = list("nutriment" = list(1,5), "durianpaste" = list(1, 20))
|
||||
kitchen_tag = "durian"
|
||||
chems = list("nutriment" = list(1,5), "durianpaste" = list(1, 20))
|
||||
|
||||
/datum/seed/durian/New()
|
||||
..()
|
||||
@@ -1097,8 +1100,8 @@
|
||||
name = "watermelon"
|
||||
seed_name = "watermelon"
|
||||
display_name = "watermelon vine"
|
||||
chems = list("nutriment" = list(1,6), "watermelonjuice" = list(10,6))
|
||||
kitchen_tag = "watermelon"
|
||||
chems = list("nutriment" = list(1,6), "watermelonjuice" = list(10,6))
|
||||
|
||||
/datum/seed/watermelon/New()
|
||||
..()
|
||||
@@ -1121,8 +1124,8 @@
|
||||
name = "pumpkin"
|
||||
seed_name = "pumpkin"
|
||||
display_name = "pumpkin vine"
|
||||
chems = list("nutriment" = list(1,6))
|
||||
kitchen_tag = "pumpkin"
|
||||
chems = list("nutriment" = list(1,6))
|
||||
|
||||
/datum/seed/pumpkin/New()
|
||||
..()
|
||||
@@ -1141,8 +1144,8 @@
|
||||
name = "lime"
|
||||
seed_name = "lime"
|
||||
display_name = "lime trees"
|
||||
chems = list("nutriment" = list(1,20), "limejuice" = list(10,20))
|
||||
kitchen_tag = "lime"
|
||||
chems = list("nutriment" = list(1,20), "limejuice" = list(10,20))
|
||||
|
||||
/datum/seed/citrus/New()
|
||||
..()
|
||||
@@ -1161,8 +1164,8 @@
|
||||
name = "lemon"
|
||||
seed_name = "lemon"
|
||||
display_name = "lemon trees"
|
||||
chems = list("nutriment" = list(1,20), "lemonjuice" = list(10,20))
|
||||
kitchen_tag = "lemon"
|
||||
chems = list("nutriment" = list(1,20), "lemonjuice" = list(10,20))
|
||||
|
||||
/datum/seed/citrus/lemon/New()
|
||||
..()
|
||||
@@ -1188,8 +1191,8 @@
|
||||
name = "grass"
|
||||
seed_name = "grass"
|
||||
display_name = "grass"
|
||||
chems = list("nutriment" = list(1,20))
|
||||
kitchen_tag = "grass"
|
||||
chems = list("nutriment" = list(1,20))
|
||||
|
||||
/datum/seed/grass/New()
|
||||
..()
|
||||
@@ -1208,6 +1211,7 @@
|
||||
name = "cocoa"
|
||||
seed_name = "cacao"
|
||||
display_name = "cacao tree"
|
||||
kitchen_tag = "cocoa"
|
||||
chems = list("nutriment" = list(1,10), "coco" = list(4,5))
|
||||
|
||||
/datum/seed/cocoa/New()
|
||||
@@ -1228,8 +1232,8 @@
|
||||
seed_name = "cherry"
|
||||
seed_noun = "pits"
|
||||
display_name = "cherry tree"
|
||||
chems = list("nutriment" = list(1,15), "sugar" = list(1,15), "cherryjelly" = list(10,15))
|
||||
kitchen_tag = "cherries"
|
||||
chems = list("nutriment" = list(1,15), "sugar" = list(1,15), "cherryjelly" = list(10,15))
|
||||
|
||||
/datum/seed/cherries/New()
|
||||
..()
|
||||
@@ -1248,8 +1252,8 @@
|
||||
name = "kudzu"
|
||||
seed_name = "kudzu"
|
||||
display_name = "kudzu vines"
|
||||
chems = list("nutriment" = list(1,50), "anti_toxin" = list(1,25))
|
||||
kitchen_tag = "kudzu"
|
||||
chems = list("nutriment" = list(1,50), "anti_toxin" = list(1,25))
|
||||
|
||||
/datum/seed/kudzu/New()
|
||||
..()
|
||||
@@ -1290,8 +1294,8 @@
|
||||
name = "shand"
|
||||
seed_name = "Selem's hand"
|
||||
display_name = "Selem's hand leaves"
|
||||
chems = list("bicaridine" = list(0,10))
|
||||
kitchen_tag = "shand"
|
||||
chems = list("bicaridine" = list(0,10))
|
||||
|
||||
/datum/seed/shand/New()
|
||||
..()
|
||||
@@ -1310,8 +1314,8 @@
|
||||
name = "mtear"
|
||||
seed_name = "Malani's tear"
|
||||
display_name = "Malani's tear leaves"
|
||||
chems = list("honey" = list(1,10), "kelotane" = list(3,5))
|
||||
kitchen_tag = "mtear"
|
||||
chems = list("honey" = list(1,10), "kelotane" = list(3,5))
|
||||
|
||||
/datum/seed/mtear/New()
|
||||
..()
|
||||
@@ -1330,6 +1334,7 @@
|
||||
name = "telriis"
|
||||
seed_name = "telriis"
|
||||
display_name = "telriis grass"
|
||||
kitchen_tag = "telriis"
|
||||
chems = list("pwine" = list(1,5), "nutriment" = list(1,6))
|
||||
|
||||
/datum/seed/telriis/New()
|
||||
@@ -1346,6 +1351,7 @@
|
||||
name = "thaadra"
|
||||
seed_name = "thaa'dra"
|
||||
display_name = "thaa'dra lichen"
|
||||
kitchen_tag = "thaadra"
|
||||
chems = list("frostoil" = list(1,5),"nutriment" = list(1,5))
|
||||
|
||||
/datum/seed/thaadra/New()
|
||||
@@ -1362,6 +1368,7 @@
|
||||
name = "jurlmah"
|
||||
seed_name = "jurl'mah"
|
||||
display_name = "jurl'mah reeds"
|
||||
kitchen_tag = "jurlmah"
|
||||
chems = list("serotrotium" = list(1,5),"nutriment" = list(1,5))
|
||||
|
||||
/datum/seed/jurlmah/New()
|
||||
@@ -1377,6 +1384,7 @@
|
||||
name = "amauri"
|
||||
seed_name = "amauri"
|
||||
display_name = "amauri plant"
|
||||
kitchen_tag = "amauri"
|
||||
chems = list("zombiepowder" = list(1,10),"condensedcapsaicin" = list(1,5),"nutriment" = list(1,5))
|
||||
|
||||
/datum/seed/amauri/New()
|
||||
@@ -1392,6 +1400,7 @@
|
||||
name = "gelthi"
|
||||
seed_name = "gelthi"
|
||||
display_name = "gelthi plant"
|
||||
kitchen_tag = "gelthi"
|
||||
chems = list("stoxin" = list(1,5),"capsaicin" = list(1,5),"nutriment" = list(1,5))
|
||||
|
||||
/datum/seed/gelthi/New()
|
||||
@@ -1407,6 +1416,7 @@
|
||||
name = "vale"
|
||||
seed_name = "vale"
|
||||
display_name = "vale bush"
|
||||
kitchen_tag = "vale"
|
||||
chems = list("paracetamol" = list(1,5),"dexalin" = list(1,2),"nutriment"= list(1,5))
|
||||
|
||||
/datum/seed/vale/New()
|
||||
@@ -1422,6 +1432,7 @@
|
||||
name = "surik"
|
||||
seed_name = "surik"
|
||||
display_name = "surik vine"
|
||||
kitchen_tag = "surik"
|
||||
chems = list("impedrezene" = list(1,3),"synaptizine" = list(1,2),"nutriment" = list(1,5))
|
||||
|
||||
/datum/seed/surik/New()
|
||||
|
||||
@@ -46,8 +46,8 @@
|
||||
new /datum/data/mining_equipment("Industrial Hardsuit - Maneuvering Jets", /obj/item/rig_module/maneuvering_jets, 1250),
|
||||
new /datum/data/mining_equipment("Hardsuit - Intelligence Storage", /obj/item/rig_module/ai_container, 2500),
|
||||
new /datum/data/mining_equipment("Hardsuit - Smoke Bomb Deployer", /obj/item/rig_module/grenade_launcher/smoke, 2000),
|
||||
new /datum/data/mining_equipment("Industrial Equipment - Sheet-Snatcher", /obj/item/weapon/gun/magnetic/matfed, 3000),
|
||||
new /datum/data/mining_equipment("Industrial Equipment - Phoron Bore",/obj/item/weapon/storage/bag/sheetsnatcher, 500),
|
||||
new /datum/data/mining_equipment("Industrial Equipment - Phoron Bore", /obj/item/weapon/gun/magnetic/matfed, 3000),
|
||||
new /datum/data/mining_equipment("Industrial Equipment - Sheet-Snatcher",/obj/item/weapon/storage/bag/sheetsnatcher, 500),
|
||||
new /datum/data/mining_equipment("Digital Tablet - Standard", /obj/item/modular_computer/tablet/preset/custom_loadout/standard, 500),
|
||||
new /datum/data/mining_equipment("Digital Tablet - Advanced", /obj/item/modular_computer/tablet/preset/custom_loadout/advanced, 1000),
|
||||
new /datum/data/mining_equipment("Diamond Pickaxe", /obj/item/weapon/pickaxe/diamond, 2000),
|
||||
|
||||
@@ -125,11 +125,7 @@ var/datum/species/shapeshifter/promethean/prometheans
|
||||
/obj/item/weapon/storage/toolbox/lunchbox/nymph,
|
||||
/obj/item/weapon/storage/toolbox/lunchbox/syndicate)) //Only pick the empty types
|
||||
var/obj/item/weapon/storage/toolbox/lunchbox/L = new boxtype(get_turf(H))
|
||||
var/mob/living/simple_mob/animal/passive/mouse/mouse = new (L)
|
||||
var/obj/item/weapon/holder/holder = new (L)
|
||||
holder.held_mob = mouse
|
||||
mouse.forceMove(holder)
|
||||
holder.sync(mouse)
|
||||
new /obj/item/weapon/reagent_containers/food/snacks/candy/proteinbar(L)
|
||||
if(H.backbag == 1)
|
||||
H.equip_to_slot_or_del(L, slot_r_hand)
|
||||
else
|
||||
|
||||
@@ -135,8 +135,8 @@
|
||||
/obj/item/weapon/reagent_containers/glass/proc/update_name_label()
|
||||
if(label_text == "")
|
||||
name = base_name
|
||||
else if(length(label_text) > 10)
|
||||
var/short_label_text = copytext(label_text, 1, 11)
|
||||
else if(length(label_text) > 20)
|
||||
var/short_label_text = copytext(label_text, 1, 21)
|
||||
name = "[base_name] ([short_label_text]...)"
|
||||
else
|
||||
name = "[base_name] ([label_text])"
|
||||
|
||||
@@ -600,6 +600,8 @@
|
||||
I.forceMove(vore_selected)
|
||||
updateVRPanel()
|
||||
|
||||
log_admin("VORE: [src] used Eat Trash to swallow [I].")
|
||||
|
||||
if(istype(I,/obj/item/device/flashlight/flare) || istype(I,/obj/item/weapon/flame/match) || istype(I,/obj/item/weapon/storage/box/matches))
|
||||
to_chat(src, "<span class='notice'>You can taste the flavor of spicy cardboard.</span>")
|
||||
else if(istype(I,/obj/item/device/flashlight/glowstick))
|
||||
|
||||
@@ -7763,10 +7763,12 @@
|
||||
/turf/simulated/floor/tiled/monotile,
|
||||
/area/tether/exploration)
|
||||
"mv" = (
|
||||
/obj/structure/shuttle/engine/propulsion,
|
||||
/turf/simulated/floor/reinforced,
|
||||
/turf/simulated/shuttle/plating/airless/carry,
|
||||
/area/shuttle/excursion/tether)
|
||||
/obj/effect/floor_decal/industrial/outline/yellow,
|
||||
/obj/machinery/alarm{
|
||||
pixel_y = 22
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/security/hallwayaux)
|
||||
"mw" = (
|
||||
/obj/effect/floor_decal/techfloor{
|
||||
dir = 1
|
||||
@@ -11395,12 +11397,12 @@
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
|
||||
dir = 5
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
|
||||
dir = 5
|
||||
},
|
||||
/obj/machinery/computer/secure_data{
|
||||
dir = 1
|
||||
},
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
|
||||
dir = 6
|
||||
},
|
||||
/turf/simulated/floor/tiled/white,
|
||||
/area/security/forensics)
|
||||
"sc" = (
|
||||
@@ -12854,36 +12856,10 @@
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/security/hallway)
|
||||
"ue" = (
|
||||
/obj/effect/floor_decal/borderfloor{
|
||||
dir = 4;
|
||||
pixel_x = -16
|
||||
},
|
||||
/obj/effect/floor_decal/corner/red/border{
|
||||
dir = 4;
|
||||
pixel_x = -16
|
||||
},
|
||||
/obj/effect/floor_decal/corner/red{
|
||||
icon_state = "corner_white";
|
||||
dir = 6
|
||||
},
|
||||
/obj/structure/table/steel,
|
||||
/obj/item/bodybag/cryobag{
|
||||
pixel_x = 6
|
||||
},
|
||||
/obj/item/weapon/storage/firstaid/regular{
|
||||
pixel_x = 5;
|
||||
pixel_y = 5
|
||||
},
|
||||
/obj/machinery/recharger/wallcharger{
|
||||
pixel_x = 32;
|
||||
pixel_y = -9
|
||||
},
|
||||
/obj/machinery/recharger/wallcharger{
|
||||
pixel_x = 32;
|
||||
pixel_y = 2
|
||||
},
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/security/hallway)
|
||||
/obj/structure/shuttle/engine/propulsion,
|
||||
/turf/simulated/floor/reinforced,
|
||||
/turf/simulated/shuttle/plating/airless/carry,
|
||||
/area/shuttle/excursion/tether)
|
||||
"uf" = (
|
||||
/obj/structure/cable{
|
||||
d1 = 2;
|
||||
@@ -28390,6 +28366,38 @@
|
||||
/obj/machinery/light,
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/hallway/station/upper)
|
||||
"SJ" = (
|
||||
/obj/effect/floor_decal/borderfloor{
|
||||
dir = 4;
|
||||
pixel_x = -16
|
||||
},
|
||||
/obj/effect/floor_decal/corner/red/border{
|
||||
dir = 4;
|
||||
pixel_x = -16
|
||||
},
|
||||
/obj/effect/floor_decal/corner/red{
|
||||
icon_state = "corner_white";
|
||||
dir = 6
|
||||
},
|
||||
/obj/structure/table/steel,
|
||||
/obj/item/bodybag/cryobag{
|
||||
pixel_x = 6
|
||||
},
|
||||
/obj/item/weapon/storage/firstaid/regular{
|
||||
pixel_x = 5;
|
||||
pixel_y = 5
|
||||
},
|
||||
/obj/machinery/recharger/wallcharger{
|
||||
pixel_x = 32;
|
||||
pixel_y = -9
|
||||
},
|
||||
/obj/machinery/recharger/wallcharger{
|
||||
pixel_x = 32;
|
||||
pixel_y = 2
|
||||
},
|
||||
/obj/item/weapon/reagent_containers/spray/cleaner,
|
||||
/turf/simulated/floor/tiled,
|
||||
/area/security/hallway)
|
||||
"SK" = (
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
|
||||
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
|
||||
@@ -35212,7 +35220,7 @@ bq
|
||||
bq
|
||||
cd
|
||||
dI
|
||||
dp
|
||||
mv
|
||||
dM
|
||||
ej
|
||||
cP
|
||||
@@ -37080,7 +37088,7 @@ mH
|
||||
rB
|
||||
mH
|
||||
tj
|
||||
ue
|
||||
SJ
|
||||
mH
|
||||
uP
|
||||
uP
|
||||
@@ -39759,7 +39767,7 @@ it
|
||||
di
|
||||
di
|
||||
dy
|
||||
mv
|
||||
ue
|
||||
cK
|
||||
cK
|
||||
ms
|
||||
@@ -39901,7 +39909,7 @@ iK
|
||||
jY
|
||||
kn
|
||||
di
|
||||
mv
|
||||
ue
|
||||
cK
|
||||
cK
|
||||
ms
|
||||
@@ -40043,7 +40051,7 @@ iK
|
||||
jY
|
||||
kn
|
||||
di
|
||||
mv
|
||||
ue
|
||||
cK
|
||||
cK
|
||||
ms
|
||||
@@ -40895,7 +40903,7 @@ eb
|
||||
ka
|
||||
ky
|
||||
di
|
||||
mv
|
||||
ue
|
||||
cK
|
||||
cK
|
||||
ms
|
||||
@@ -41037,7 +41045,7 @@ jf
|
||||
kj
|
||||
kQ
|
||||
di
|
||||
mv
|
||||
ue
|
||||
cK
|
||||
cK
|
||||
ms
|
||||
@@ -41179,7 +41187,7 @@ jr
|
||||
kk
|
||||
kR
|
||||
dy
|
||||
mv
|
||||
ue
|
||||
cK
|
||||
cK
|
||||
ms
|
||||
|
||||
Reference in New Issue
Block a user