cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-24 20:47:43 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into kk-misc3

Browse Source
This commit is contained in:
Killian
2021-02-08 19:27:24 +00:00
parent 17bed359bd 8b0c23c122
commit 5d82ea8dca
59 changed files with 2656 additions and 1409 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__defines/species_languages_vr.dm
+1
View File
@@ -10,6 +10,7 @@
#define LANGUAGE_ENOCHIAN "Enochian"
#define LANGUAGE_VESPINAE "Vespinae"
#define LANGUAGE_SPACER "Spacer"
#define LANGUAGE_CLOWNISH "Coulrian"
#define LANGUAGE_CHIMPANZEE "Chimpanzee"
#define LANGUAGE_NEAERA "Neaera"
code/datums/uplink/tools_vr.dm
+5
View File
@@ -41,6 +41,11 @@
item_cost = 10
path = /obj/item/clothing/suit/space/void/autolok
/datum/uplink_item/item/tools/inflatable
name = "Inflatables"
item_cost = 10
path = /obj/item/weapon/storage/briefcase/inflatable
/datum/uplink_item/item/tools/elitetablet
name = "Tablet (Advanced)"
item_cost = 15
code/game/jobs/access_datum_vr.dm
+19 -1
View File
@@ -27,4 +27,22 @@ var/const/access_pilot = 67
/datum/access/entertainment
id = access_entertainment
desc = "Entertainment Backstage"
region = ACCESS_REGION_GENERAL
region = ACCESS_REGION_GENERAL
/var/const/access_mime = 138
/datum/access/mime
id = access_mime
desc = "Mime Office"
region = ACCESS_REGION_GENERAL
/var/const/access_clown = 136
/datum/access/clown
id = access_clown
desc = "Clown Office"
region = ACCESS_REGION_GENERAL
/var/const/access_tomfoolery = 137
/datum/access/tomfoolery
id = access_tomfoolery
desc = "Tomfoolery Closet"
region = ACCESS_REGION_GENERAL
code/game/jobs/job/captain_vr.dm
+2 -2
View File
@@ -26,13 +26,13 @@
access_all_personal_lockers, access_maint_tunnels, access_bar, access_janitor, access_construction, access_morgue,
access_crematorium, access_kitchen, access_cargo, access_cargo_bot, access_mailsorting, access_qm, access_hydroponics, access_lawyer,
access_chapel_office, access_library, access_research, access_mining, access_heads_vault, access_mining_station,
access_hop, access_RC_announce, access_keycard_auth)
access_hop, access_RC_announce, access_clown, access_tomfoolery, access_mime, access_keycard_auth)
minimal_access = list(access_security, access_sec_doors, access_brig, access_forensics_lockers,
access_medical, access_engine, access_change_ids, access_ai_upload, access_eva, access_heads,
access_all_personal_lockers, access_maint_tunnels, access_bar, access_janitor, access_construction, access_morgue,
access_crematorium, access_kitchen, access_cargo, access_cargo_bot, access_mailsorting, access_qm, access_hydroponics, access_lawyer,
access_chapel_office, access_library, access_research, access_mining, access_heads_vault, access_mining_station,
access_hop, access_RC_announce, access_keycard_auth)
access_hop, access_RC_announce, access_clown, access_tomfoolery, access_mime, access_keycard_auth)
/datum/alt_title/deputy_manager
title = "Deputy Manager"
code/game/jobs/job/special_vr.dm
+10 -10
View File
@@ -56,14 +56,14 @@
departments = list(DEPARTMENT_CIVILIAN)
department_flag = CIVILIAN
faction = "Station"
total_positions = -1
spawn_positions = -1
total_positions = 1
spawn_positions = 1
supervisors = "the spirit of laughter"
selection_color = "#515151"
economic_modifier = 1
job_description = "A Clown is there to entertain the crew and keep high morale using various harmless pranks and ridiculous jokes!"
whitelist_only = 1
latejoin_only = 1
latejoin_only = 0
outfit_type = /decl/hierarchy/outfit/job/clown
pto_type = PTO_CIVILIAN
alt_titles = list("Jester" = /datum/alt_title/jester, "Fool" = /datum/alt_title/fool)
@@ -76,9 +76,9 @@
/datum/job/clown/get_access()
if(config.assistant_maint)
return list(access_maint_tunnels, access_entertainment)
return list(access_maint_tunnels, access_entertainment, access_clown, access_tomfoolery)
else
return list(access_entertainment)
return list(access_entertainment, access_clown, access_tomfoolery)
/datum/job/mime
title = "Mime"
@@ -86,15 +86,15 @@
departments = list(DEPARTMENT_CIVILIAN)
department_flag = CIVILIAN
faction = "Station"
total_positions = -1
spawn_positions = -1
total_positions = 1
spawn_positions = 1
supervisors = "the spirit of performance"
selection_color = "#515151"
economic_modifier = 1
job_description = "A Mime is there to entertain the crew and keep high morale using unbelievable performances and acting skills!"
alt_titles = list("Poseur" = /datum/alt_title/poseur)
whitelist_only = 1
latejoin_only = 1
latejoin_only = 0
outfit_type = /decl/hierarchy/outfit/job/mime
pto_type = PTO_CIVILIAN
@@ -103,6 +103,6 @@
/datum/job/mime/get_access()
if(config.assistant_maint)
return list(access_maint_tunnels, access_entertainment)
return list(access_maint_tunnels, access_entertainment, access_tomfoolery, access_mime)
else
return list(access_entertainment)
return list(access_entertainment, access_tomfoolery, access_mime)
code/game/machinery/vending_machines_vr.dm
+4 -4
View File
@@ -1446,7 +1446,7 @@
/obj/item/seeds/riceseed = 3,
/obj/item/seeds/rose = 3,
/obj/item/seeds/soyaseed = 3,
/obj/item/seeds/spineapple = 3,
/obj/item/seeds/pineapple = 3,
/obj/item/seeds/sugarcaneseed = 3,
/obj/item/seeds/sunflowerseed = 3,
/obj/item/seeds/shandseed = 2,
@@ -3940,7 +3940,7 @@
/obj/item/weapon/reagent_containers/food/snacks/slice/mushroompizza = 10,
/obj/item/weapon/reagent_containers/food/snacks/slice/orangecake = 10,
/obj/item/weapon/reagent_containers/food/snacks/slice/peanutcake = 10,
/obj/item/weapon/reagent_containers/food/snacks/slice/pineapple = 10,
/obj/item/weapon/reagent_containers/food/snacks/pineappleslice = 10,
/obj/item/weapon/reagent_containers/food/snacks/slice/plaincake = 10,
/obj/item/weapon/reagent_containers/food/snacks/slice/pumpkinpie = 10,
/obj/item/weapon/reagent_containers/food/snacks/slice/tofubread = 10,
@@ -4404,7 +4404,7 @@
/obj/item/weapon/reagent_containers/food/snacks/slice/mushroompizza = 10,
/obj/item/weapon/reagent_containers/food/snacks/slice/orangecake = 10,
/obj/item/weapon/reagent_containers/food/snacks/slice/peanutcake = 10,
/obj/item/weapon/reagent_containers/food/snacks/slice/pineapple = 10,
/obj/item/weapon/reagent_containers/food/snacks/pineappleslice = 10,
/obj/item/weapon/reagent_containers/food/snacks/slice/plaincake = 10,
/obj/item/weapon/reagent_containers/food/snacks/slice/pumpkinpie = 10,
/obj/item/weapon/reagent_containers/food/snacks/slice/tofubread = 10,
@@ -4576,7 +4576,7 @@
/obj/item/seeds/riceseed = 3,
/obj/item/seeds/rose = 3,
/obj/item/seeds/soyaseed = 3,
/obj/item/seeds/spineapple = 3,
/obj/item/seeds/pineapple = 3,
/obj/item/seeds/sugarcaneseed = 3,
/obj/item/seeds/sunflowerseed = 3,
/obj/item/seeds/shandseed = 2,
code/modules/client/preference_setup/vore/07_traits.dm
+15 -4
View File
@@ -2,6 +2,9 @@
#define NEUTRAL_MODE 2
#define NEGATIVE_MODE 3
#define ORGANICS 1
#define SYNTHETICS 2
/datum/preferences
var/custom_species // Custom species name, can't be changed due to it having been used in savefiles already.
var/custom_base // What to base the custom species on
@@ -15,6 +18,7 @@
var/starting_trait_points = STARTING_SPECIES_POINTS
var/max_traits = MAX_SPECIES_TRAITS
var/dirty_synth = 0 //Are you a synth
var/gross_meatbag = 0 //Where'd I leave my Voight-Kampff test kit?
// Definition of the stuff for Ears
/datum/category_item/player_setup_item/vore/traits
@@ -85,6 +89,10 @@
if(character.isSynthetic()) //Checking if we have a synth on our hands, boys.
pref.dirty_synth = 1
pref.gross_meatbag = 0
else
pref.gross_meatbag = 1
pref.dirty_synth = 0
var/datum/species/S = character.species
var/SB
@@ -268,13 +276,16 @@
var/conflict = FALSE
user.isSynthetic() //Recheck just to be sure
if(pref.dirty_synth && instance.not_for_synths)//if you are a synth you can't take this trait.
alert("You cannot take this trait as a SYNTH.\
Please remove that trait, or pick another trait to add.","Error")
if(pref.dirty_synth && !(instance.can_take & SYNTHETICS))
alert("The trait you've selected can only be taken by organic characters!","Error")
pref.dirty_synth = 0 //Just to be sure
return TOPIC_REFRESH
if(pref.gross_meatbag && !(instance.can_take & ORGANICS))
alert("The trait you've selected can only be taken by synthetic characters!","Error")
pref.gross_meatbag = 0 //Just to be sure
return TOPIC_REFRESH
if(trait_choice in pref.pos_traits + pref.neu_traits + pref.neg_traits)
conflict = instance.name
code/modules/client/preferences.dm
+6 -6
View File
@@ -82,11 +82,11 @@ datum/preferences
//Mob preview
var/list/char_render_holders //Should only be a key-value list of north/south/east/west = obj/screen.
var/static/list/preview_screen_locs = list(
"1" = "character_preview_map:1,5:-12",
"2" = "character_preview_map:1,3:15",
"4" = "character_preview_map:1:7,2:10",
"8" = "character_preview_map:1:-7,1:5",
"BG" = "character_preview_map:1,1 to 1,5"
"1" = "character_preview_map:2,7",
"2" = "character_preview_map:2,5",
"4" = "character_preview_map:2,3",
"8" = "character_preview_map:2,1",
"BG" = "character_preview_map:1,1 to 3,8"
)
//Jobs, uses bitflags
@@ -274,7 +274,7 @@ datum/preferences
if(!BG)
BG = new
BG.plane = TURF_PLANE
BG.icon = 'icons/effects/128x48.dmi'
BG.icon = 'icons/effects/setup_backgrounds_vr.dmi'
BG.pref = src
LAZYSET(char_render_holders, "BG", BG)
client.screen |= BG
code/modules/clothing/under/jobs/medsci.dm
+1
View File
@@ -164,6 +164,7 @@
desc = "It's made of a special fiber that provides minor protection against biohazards"
icon_state = "scrubs"
item_state_slots = list(slot_r_hand_str = "white", slot_l_hand_str = "white")
index = 1
/obj/item/clothing/under/rank/psych
desc = "A basic white jumpsuit. It has turqouise markings that denote the wearer as a psychiatrist."
code/modules/clothing/under/miscellaneous.dm
+9 -2
View File
@@ -621,13 +621,13 @@ Uniforms and such
*/
/obj/item/clothing/under/sundress
name = "flowery white sundress"
name = "sundress"
desc = "Makes you want to frolic in a field of daisies."
icon_state = "sundress"
body_parts_covered = UPPER_TORSO|LOWER_TORSO
/obj/item/clothing/under/sundress_white
name = "white sundress"
name = "flowery white sundress"
desc = "A white sundress decorated with purple lilies."
icon_state = "sundress_white"
body_parts_covered = UPPER_TORSO|LOWER_TORSO
@@ -637,41 +637,48 @@ Uniforms and such
desc = "A cute pink sundress."
icon_state = "pinksun"
body_parts_covered = UPPER_TORSO|LOWER_TORSO
index = 1
/obj/item/clothing/under/dress/sundress_white
name = "white sundress"
desc = "A white sundress, it's short."
icon_state = "whitesun"
body_parts_covered = UPPER_TORSO|LOWER_TORSO
index = 1
/obj/item/clothing/under/dress/sundress_pinkbow
name = "bowed pink sundress"
desc = "A cute pink sundress with a bow."
icon_state = "bowsun"
body_parts_covered = UPPER_TORSO|LOWER_TORSO
index = 1
/obj/item/clothing/under/dress/sundress_blue
name = "long blue sundress"
desc = "A long blue sun dress with white frills towards the bottom."
icon_state = "bluesun"
body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS
index = 1
/obj/item/clothing/under/dress/sundress_pinkshort
name = "short pink sundress"
desc = "A very short pink sundress, it's more like a chemise."
icon_state = "shortpink"
body_parts_covered = UPPER_TORSO|LOWER_TORSO
index = 1
/obj/item/clothing/under/dress/twopiece
name = "two-piece dress"
desc = "A fancy two-piece dress, the pieces are sewn together."
icon_state = "twopiece"
body_parts_covered = UPPER_TORSO|LOWER_TORSO
index = 1
/obj/item/clothing/under/dress/gothic2
name = "lacey gothic dress"
desc = "An elegant gothic dress with lace decorations."
icon_state = "gothic2"
index = 1
/obj/item/clothing/under/captainformal
name = "site manager's formal uniform"
code/modules/food/food/snacks.dm
+175 -345
View File
File diff suppressed because it is too large Load Diff
code/modules/food/food/snacks_vr.dm
+42
View File
@@ -759,3 +759,45 @@
/obj/item/weapon/reagent_containers/food/snacks/bun/Initialize()
. = ..()
//Readded Polaris Foods
/obj/item/weapon/reagent_containers/food/snacks/nachos
name = "nachos"
desc = "Chips from Old Mexico."
icon_state = "nachos"
nutriment_amt = 2
nutriment_desc = list("salt" = 1)
/obj/item/weapon/reagent_containers/food/snacks/nachos/Initialize()
. = ..()
reagents.add_reagent("nutriment", 1)
bitesize = 1
/obj/item/weapon/reagent_containers/food/snacks/cheesenachos
name = "cheesy nachos"
desc = "The delicious combination of nachos and melting cheese."
icon_state = "cheesenachos"
nutriment_amt = 5
nutriment_desc = list("salt" = 2, "cheese" = 3)
/obj/item/weapon/reagent_containers/food/snacks/cheesenachos/Initialize()
. = ..()
reagents.add_reagent("nutriment", 5)
reagents.add_reagent("protein", 2)
bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/onionsoup
name = "Onion Soup"
desc = "A soup with layers."
icon_state = "onionsoup"
trash = /obj/item/trash/snack_bowl
filling_color = "#E0C367"
center_of_mass = list("x"=16, "y"=7)
nutriment_amt = 5
nutriment_desc = list("onion" = 2, "soup" = 2)
/obj/item/weapon/reagent_containers/food/snacks/onionsoup/Initialize()
. = ..()
bitesize = 3
code/modules/food/kitchen/cooking_machines/oven.dm
+6 -6
View File
@@ -38,12 +38,12 @@
"Cookie" = /obj/item/weapon/reagent_containers/food/snacks/variable/cookie,
"Donut" = /obj/item/weapon/reagent_containers/food/snacks/variable/donut,
)
/obj/machinery/appliance/cooker/oven/Initialize()
. = ..()
oven_loop = new(list(src), FALSE)
/obj/machinery/appliance/cooker/oven/Destroy()
QDEL_NULL(oven_loop)
return ..()
@@ -104,9 +104,9 @@
cooking = FALSE
playsound(src, 'sound/machines/hatch_open.ogg', 20, 1)
to_chat(user, "<span class='notice'>You [open ? "open" : "close"] the oven door.</span>")
to_chat(user, "<span class='notice'>You [open? "open":"close"] the oven door</span>")
update_icon()
/obj/machinery/appliance/cooker/oven/proc/manip(var/obj/item/I)
// check if someone's trying to manipulate the machine
@@ -152,4 +152,4 @@
combination_cook(CI)
return
else
..()
..()
code/modules/food/recipes_fryer.dm
+35 -19
View File
@@ -29,10 +29,17 @@
/datum/recipe/bellefritter
appliance = FRYER
reagents = list("sugar" = 5, "batter" = 10)
coating = /datum/reagent/nutriment/coating/batter
reagents = list("sugar" = 5)
items = list(/obj/item/weapon/reagent_containers/food/snacks/frostbelle)
result = /obj/item/weapon/reagent_containers/food/snacks/bellefritter
/datum/recipe/onionrings
appliance = FRYER
coating = /datum/reagent/nutriment/coating/batter
fruit = list("onion" = 1)
result = /obj/item/weapon/reagent_containers/food/snacks/onionrings
//Meaty Recipes
//====================
/datum/recipe/cubancarp
@@ -86,6 +93,31 @@
reagent_mix = RECIPE_REAGENT_REPLACE //Simplify end product
result = /obj/item/weapon/reagent_containers/food/snacks/friedmushroom
/datum/recipe/fishfingers
items = list(
/obj/item/weapon/reagent_containers/food/snacks/carpmeat,
)
coating = /datum/reagent/nutriment/coating/batter
result = /obj/item/weapon/reagent_containers/food/snacks/fishfingers
reagent_mix = RECIPE_REAGENT_REPLACE
/datum/recipe/corn_dog
appliance = FRYER
items = list(
/obj/item/weapon/reagent_containers/food/snacks/sausage
)
fruit = list("corn" = 1)
coating = /datum/reagent/nutriment/coating/batter
result = /obj/item/weapon/reagent_containers/food/snacks/corn_dog
/datum/recipe/sweet_and_sour
appliance = FRYER
items = list(
/obj/item/weapon/reagent_containers/food/snacks/bacon,
/obj/item/weapon/reagent_containers/food/snacks/cutlet
)
reagents = list("soysauce" = 5, "batter" = 10)
result = /obj/item/weapon/reagent_containers/food/snacks/sweet_and_sour
//Sweet Recipes.
//==================
@@ -145,24 +177,7 @@
result = /obj/item/weapon/reagent_containers/food/snacks/pisanggoreng
coating = /datum/reagent/nutriment/coating/batter
/datum/recipe/corn_dog
appliance = FRYER
items = list(
/obj/item/weapon/reagent_containers/food/snacks/sausage
)
fruit = list("corn" = 1)
coating = /datum/reagent/nutriment/coating/batter
result = /obj/item/weapon/reagent_containers/food/snacks/corn_dog
/datum/recipe/sweet_and_sour
appliance = FRYER
items = list(
/obj/item/weapon/reagent_containers/food/snacks/bacon,
/obj/item/weapon/reagent_containers/food/snacks/cutlet
)
reagents = list("soysauce" = 5, "batter" = 10)
result = /obj/item/weapon/reagent_containers/food/snacks/sweet_and_sour
//VOREStation Add Start
/datum/recipe/generalschicken
appliance = FRYER
reagents = list("capsaicin" = 2, "sugar" = 2, "batter" = 10)
@@ -182,3 +197,4 @@
/obj/item/weapon/reagent_containers/food/snacks/meat
)
result = /obj/item/weapon/storage/box/wings //This is kinda like the donut box.
//VOREStation Add End
code/modules/food/recipes_fryer_vr.dm
+19
View File
@@ -0,0 +1,19 @@
/datum/recipe/generalschicken
appliance = FRYER
reagents = list("capsaicin" = 2, "sugar" = 2, "batter" = 10)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/meat,
/obj/item/weapon/reagent_containers/food/snacks/meat
)
result = /obj/item/weapon/reagent_containers/food/snacks/generalschicken
/datum/recipe/chickenwings
appliance = FRYER
reagents = list("capsaicin" = 5, "batter" = 10)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/meat,
/obj/item/weapon/reagent_containers/food/snacks/meat,
/obj/item/weapon/reagent_containers/food/snacks/meat,
/obj/item/weapon/reagent_containers/food/snacks/meat
)
result = /obj/item/weapon/storage/box/wings //This is kinda like the donut box.
code/modules/food/recipes_grill.dm
+92 -10
View File
@@ -13,7 +13,7 @@
/obj/item/weapon/reagent_containers/food/snacks/meat //do not place this recipe before /datum/recipe/humanburger
)
result = /obj/item/weapon/reagent_containers/food/snacks/monkeyburger
/datum/recipe/syntiburger
appliance = GRILL
items = list(
@@ -85,7 +85,7 @@
/obj/item/clothing/head/beret
)
result = /obj/item/weapon/reagent_containers/food/snacks/mimeburger
/datum/recipe/mouseburger
appliance = GRILL
items = list(
@@ -93,7 +93,7 @@
/obj/item/weapon/holder/mouse
)
result = /obj/item/weapon/reagent_containers/food/snacks/mouseburger
/datum/recipe/bunbun
appliance = GRILL
items = list(
@@ -109,7 +109,7 @@
/obj/item/weapon/reagent_containers/food/snacks/sausage
)
result = /obj/item/weapon/reagent_containers/food/snacks/hotdog
/datum/recipe/humankabob
appliance = GRILL
items = list(
@@ -127,7 +127,7 @@
/obj/item/weapon/reagent_containers/food/snacks/meat,
)
result = /obj/item/weapon/reagent_containers/food/snacks/monkeykabob
/datum/recipe/monkeykabob
appliance = GRILL
items = list(
@@ -154,7 +154,7 @@
/obj/item/weapon/reagent_containers/food/snacks/tofu,
)
result = /obj/item/weapon/reagent_containers/food/snacks/tofukabob
/datum/recipe/fakespellburger
appliance = GRILL
items = list(
@@ -182,7 +182,7 @@
reagents = list("egg" = 3)
reagent_mix = RECIPE_REAGENT_REPLACE
result = /obj/item/weapon/reagent_containers/food/snacks/bigbiteburger
/datum/recipe/superbiteburger
appliance = GRILL
fruit = list("tomato" = 1)
@@ -195,7 +195,7 @@
/obj/item/weapon/reagent_containers/food/snacks/boiledegg,
)
result = /obj/item/weapon/reagent_containers/food/snacks/superbiteburger
/datum/recipe/slimeburger
appliance = GRILL
reagents = list("slimejelly" = 5)
@@ -211,7 +211,7 @@
/obj/item/weapon/reagent_containers/food/snacks/bun
)
result = /obj/item/weapon/reagent_containers/food/snacks/jellyburger/cherry
/datum/recipe/bearburger
appliance = GRILL
items = list(
@@ -229,7 +229,17 @@
/obj/item/weapon/reagent_containers/food/snacks/bacon
)
result = /obj/item/weapon/reagent_containers/food/snacks/burger/bacon
/datum/recipe/omelette
appliance = GRILL
items = list(
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge,
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge,
)
reagents = list("egg" = 6)
reagent_mix = RECIPE_REAGENT_REPLACE
result = /obj/item/weapon/reagent_containers/food/snacks/omelette
/datum/recipe/omurice
appliance = GRILL
reagents = list("rice" = 5, "ketchup" = 5, "egg" = 3)
@@ -244,3 +254,75 @@
appliance = GRILL
reagents = list("rice" = 5, "ketchup" = 5, "sodiumchloride" = 5, "egg" = 3)
result = /obj/item/weapon/reagent_containers/food/snacks/omurice/face
/datum/recipe/meatsteak
appliance = GRILL
reagents = list("sodiumchloride" = 1, "blackpepper" = 1)
items = list(/obj/item/weapon/reagent_containers/food/snacks/meat)
result = /obj/item/weapon/reagent_containers/food/snacks/meatsteak
/datum/recipe/honeytoast
appliance = GRILL
reagents = list("honey" = 5)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/slice/bread
)
reagent_mix = RECIPE_REAGENT_REPLACE //Simplify end product
result = /obj/item/weapon/reagent_containers/food/snacks/honeytoast
/datum/recipe/grilled_carp
appliance = GRILL
items = list(
/obj/item/weapon/reagent_containers/food/snacks/carpmeat,
/obj/item/weapon/reagent_containers/food/snacks/carpmeat,
/obj/item/weapon/reagent_containers/food/snacks/carpmeat,
/obj/item/weapon/reagent_containers/food/snacks/carpmeat,
/obj/item/weapon/reagent_containers/food/snacks/carpmeat,
/obj/item/weapon/reagent_containers/food/snacks/carpmeat
)
reagents = list("spacespice" = 1)
fruit = list("cabbage" = 1, "lime" = 1)
result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/grilled_carp
/datum/recipe/grilledcheese
appliance = GRILL
items = list(
/obj/item/weapon/reagent_containers/food/snacks/slice/bread,
/obj/item/weapon/reagent_containers/food/snacks/slice/bread,
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge,
)
result = /obj/item/weapon/reagent_containers/food/snacks/grilledcheese
/datum/recipe/toastedsandwich
appliance = GRILL
items = list(
/obj/item/weapon/reagent_containers/food/snacks/sandwich
)
result = /obj/item/weapon/reagent_containers/food/snacks/toastedsandwich
/datum/recipe/cheese_cracker
appliance = GRILL
items = list(
/obj/item/weapon/reagent_containers/food/snacks/spreads/butter,
/obj/item/weapon/reagent_containers/food/snacks/slice/bread,
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge
)
reagents = list("spacespice" = 1)
result = /obj/item/weapon/reagent_containers/food/snacks/cheese_cracker
result_quantity = 4
/datum/recipe/bacongrill
appliance = GRILL
items = list(
/obj/item/weapon/reagent_containers/food/snacks/spreads,
/obj/item/weapon/reagent_containers/food/snacks/rawbacon
)
result = /obj/item/weapon/reagent_containers/food/snacks/bacon
/datum/recipe/chickenfillet //Also just combinable, like burgers and hot dogs.
appliance = GRILL
items = list(
/obj/item/weapon/reagent_containers/food/snacks/chickenkatsu,
/obj/item/weapon/reagent_containers/food/snacks/bun
)
result = /obj/item/weapon/reagent_containers/food/snacks/chickenfillet
code/modules/food/recipes_microwave.dm
+55 -423
View File
@@ -43,14 +43,6 @@ I said no!
)
result = /obj/item/weapon/reagent_containers/food/snacks/devilledegg
/datum/recipe/waffles
reagents = list("sugar" = 10)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/dough,
/obj/item/weapon/reagent_containers/food/snacks/dough
)
result = /obj/item/weapon/reagent_containers/food/snacks/waffles
/datum/recipe/donkpocket
items = list(
/obj/item/weapon/reagent_containers/food/snacks/dough,
@@ -72,15 +64,6 @@ I said no!
)
result = /obj/item/weapon/reagent_containers/food/snacks/donkpocket //SPECIAL
/datum/recipe/omelette
items = list(
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge,
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge,
)
reagents = list("egg" = 6)
reagent_mix = RECIPE_REAGENT_REPLACE
result = /obj/item/weapon/reagent_containers/food/snacks/omelette
/datum/recipe/muffin
reagents = list("milk" = 5, "sugar" = 5)
reagent_mix = RECIPE_REAGENT_REPLACE
@@ -145,10 +128,6 @@ I said no!
)
result = /obj/item/weapon/reagent_containers/food/snacks/microchips
/datum/recipe/mashedpotato
fruit = list("potato" = 1)
result = /obj/item/weapon/reagent_containers/food/snacks/mashedpotato
/datum/recipe/bangersandmash
items = list(
/obj/item/weapon/reagent_containers/food/snacks/mashedpotato,
@@ -182,25 +161,11 @@ I said no!
)
result = /obj/item/weapon/reagent_containers/food/snacks/fortunecookie
/datum/recipe/meatsteak
reagents = list("sodiumchloride" = 1, "blackpepper" = 1)
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/pizzahawaiian
fruit = list("tomato" = 1, "pineapple" = 1)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough,
/obj/item/weapon/reagent_containers/food/snacks/cutlet,
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge
)
result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/pineapple
/datum/recipe/spacylibertyduff
reagents = list("water" = 5, "vodka" = 5, "psilocybin" = 5)
result = /obj/item/weapon/reagent_containers/food/snacks/spacylibertyduff
@@ -260,12 +225,6 @@ I said no!
)
result = /obj/item/weapon/reagent_containers/food/snacks/sandwich
/datum/recipe/toastedsandwich
items = list(
/obj/item/weapon/reagent_containers/food/snacks/sandwich
)
result = /obj/item/weapon/reagent_containers/food/snacks/toastedsandwich
/datum/recipe/peanutbutterjellysandwich
reagents = list("cherryjelly" = 5, "peanutbutter" = 5)
items = list(
@@ -274,13 +233,6 @@ I said no!
)
result = /obj/item/weapon/reagent_containers/food/snacks/jellysandwich/peanutbutter
/datum/recipe/grilledcheese
items = list(
/obj/item/weapon/reagent_containers/food/snacks/slice/bread,
/obj/item/weapon/reagent_containers/food/snacks/slice/bread,
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge,
)
result = /obj/item/weapon/reagent_containers/food/snacks/grilledcheese
/datum/recipe/tomatosoup
fruit = list("tomato" = 2)
@@ -379,11 +331,6 @@ I said no!
reagents = list("water" = 5, "sugar" = 5)
result = /obj/item/weapon/reagent_containers/food/snacks/candiedapple
/datum/recipe/applepie
fruit = list("apple" = 1)
items = list(/obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough)
result = /obj/item/weapon/reagent_containers/food/snacks/applepie
/datum/recipe/twobread
reagents = list("wine" = 5)
items = list(
@@ -439,30 +386,6 @@ I said no!
result = /obj/item/weapon/reagent_containers/food/snacks/sausage
result_quantity = 2
/datum/recipe/fishfingers
reagents = list("flour" = 10, "egg" = 3)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/carpmeat,
)
result = /obj/item/weapon/reagent_containers/food/snacks/fishfingers
reagent_mix = RECIPE_REAGENT_REPLACE
/datum/recipe/zestfish
fruit = list("lemon" = 1)
reagents = list("sodiumchloride" = 3)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/carpmeat
)
result = /obj/item/weapon/reagent_containers/food/snacks/zestfish
/datum/recipe/limezestfish
fruit = list("lime" = 1)
reagents = list("sodiumchloride" = 3)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/carpmeat
)
result = /obj/item/weapon/reagent_containers/food/snacks/zestfish
/datum/recipe/kudzudonburi
fruit = list("kudzu" = 1)
reagents = list("rice" = 10)
@@ -494,11 +417,7 @@ I said no!
/datum/recipe/chawanmushi
fruit = list("mushroom" = 1)
reagents = list("water" = 5, "soysauce" = 5)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/egg,
/obj/item/weapon/reagent_containers/food/snacks/egg
)
reagents = list("water" = 5, "soysauce" = 5, "egg" = 6)
result = /obj/item/weapon/reagent_containers/food/snacks/chawanmushi
/datum/recipe/beetsoup
@@ -545,17 +464,9 @@ I said no!
)
result = /obj/item/weapon/reagent_containers/food/snacks/stuffing
/datum/recipe/tofurkey
items = list(
/obj/item/weapon/reagent_containers/food/snacks/tofu,
/obj/item/weapon/reagent_containers/food/snacks/tofu,
/obj/item/weapon/reagent_containers/food/snacks/stuffing,
)
result = /obj/item/weapon/reagent_containers/food/snacks/tofurkey
/datum/recipe/mashedpotato
items = list(
/obj/item/weapon/reagent_containers/food/snacks/spreads/butter // to prevent conflicts with yellow curry
/obj/item/weapon/reagent_containers/food/snacks/spreads
)
fruit = list("potato" = 1)
result = /obj/item/weapon/reagent_containers/food/snacks/mashedpotato
@@ -574,27 +485,11 @@ I said no!
)
result = /obj/item/weapon/ruinedvirusdish
/datum/recipe/onionrings
fruit = list("onion" = 1)
reagents = list("flour" = 5)
result = /obj/item/weapon/reagent_containers/food/snacks/onionrings
/datum/recipe/onionsoup
fruit = list("onion" = 1)
reagents = list("water" = 10)
result = /obj/item/weapon/reagent_containers/food/snacks/onionsoup
//////////////////////////////////////////
// bs12 food port stuff
//////////////////////////////////////////
/datum/recipe/taco
items = list(
/obj/item/weapon/reagent_containers/food/snacks/doughslice,
/obj/item/weapon/reagent_containers/food/snacks/cutlet,
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge
)
result = /obj/item/weapon/reagent_containers/food/snacks/taco
result = /obj/item/weapon/reagent_containers/food/snacks/soup/onion
/datum/recipe/microwavebun
items = list(
@@ -643,18 +538,6 @@ I said no!
reagents = list("sugar" = 5, "frostoil" = 5)
result = /obj/item/weapon/reagent_containers/food/snacks/mint
////////////////////////
// TGstation food ports
////////////////////////
/datum/recipe/meatbun
fruit = list("cabbage" = 1)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/meatball,
/obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough,
)
result = /obj/item/weapon/reagent_containers/food/snacks/meatbun
/datum/recipe/sashimi
reagents = list("soysauce" = 5)
items = list(
@@ -739,53 +622,6 @@ I said no!
)
result = /obj/item/weapon/reagent_containers/food/snacks/porkbowl
/datum/recipe/microwavetortilla
reagents = list("flour" = 5, "water" = 5)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough
)
result = /obj/item/weapon/reagent_containers/food/snacks/tortilla
/datum/recipe/meatburrito
fruit = list("soybeans" = 1)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/tortilla,
/obj/item/weapon/reagent_containers/food/snacks/cutlet,
/obj/item/weapon/reagent_containers/food/snacks/cutlet
)
result = /obj/item/weapon/reagent_containers/food/snacks/meatburrito
/datum/recipe/cheeseburrito
fruit = list("soybeans" = 1)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/tortilla,
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge,
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge
)
result = /obj/item/weapon/reagent_containers/food/snacks/cheeseburrito
/datum/recipe/fuegoburrito
fruit = list("soybeans" = 1, "chili" = 2)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/tortilla
)
result = /obj/item/weapon/reagent_containers/food/snacks/fuegoburrito
/datum/recipe/nachos
reagents = list("sodiumchloride" = 1)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/tortilla
)
result = /obj/item/weapon/reagent_containers/food/snacks/nachos
/datum/recipe/cheesenachos
reagents = list("sodiumchloride" = 1)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/tortilla,
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge
)
result = /obj/item/weapon/reagent_containers/food/snacks/cheesenachos
/datum/recipe/cubannachos
fruit = list("chili" = 1)
reagents = list("ketchup" = 5)
@@ -861,15 +697,10 @@ I said no!
)
result = /obj/item/weapon/reagent_containers/food/snacks/bageltwo
/////////////////////////////////////////////////////////////
//Synnono Meme Foods
//
//Most recipes replace reagents with RECIPE_REAGENT_REPLACE
//to simplify the end product and balance the amount of reagents
//Recipes that use RECIPE_REAGENT_REPLACE will
//simplify the end product and balance the amount of reagents
//in some foods. Many require the space spice reagent/condiment
//to reduce the risk of future recipe conflicts.
/////////////////////////////////////////////////////////////
/datum/recipe/redcurry
reagents = list("cream" = 5, "spacespice" = 2, "rice" = 5)
@@ -934,13 +765,6 @@ I said no!
reagent_mix = RECIPE_REAGENT_REPLACE //Simplify end product
result = /obj/item/weapon/reagent_containers/food/snacks/lomein
/datum/recipe/chickenfillet //Also just combinable, like burgers and hot dogs.
items = list(
/obj/item/weapon/reagent_containers/food/snacks/chickenkatsu,
/obj/item/weapon/reagent_containers/food/snacks/bun
)
result = /obj/item/weapon/reagent_containers/food/snacks/chickenfillet
/datum/recipe/chickennoodlesoup
fruit = list("carrot" = 1)
reagents = list("water" = 10)
@@ -964,45 +788,6 @@ I said no!
reagent_mix = RECIPE_REAGENT_REPLACE //Simplify end product
result = /obj/item/weapon/reagent_containers/food/snacks/chilicheesefries
/datum/recipe/meatbun
reagents = list("spacespice" = 1, "water" = 5)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/doughslice,
/obj/item/weapon/reagent_containers/food/snacks/rawcutlet
)
reagent_mix = RECIPE_REAGENT_REPLACE //Water used up in cooking
result = /obj/item/weapon/reagent_containers/food/snacks/meatbun
/datum/recipe/custardbun
reagents = list("spacespice" = 1, "water" = 5, "egg" = 3)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/doughslice
)
reagent_mix = RECIPE_REAGENT_REPLACE //Water, egg used up in cooking
result = /obj/item/weapon/reagent_containers/food/snacks/custardbun
/datum/recipe/chickenmomo
reagents = list("spacespice" = 2, "water" = 5)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/doughslice,
/obj/item/weapon/reagent_containers/food/snacks/doughslice,
/obj/item/weapon/reagent_containers/food/snacks/doughslice,
/obj/item/weapon/reagent_containers/food/snacks/meat/chicken
)
reagent_mix = RECIPE_REAGENT_REPLACE //Simplify end product
result = /obj/item/weapon/reagent_containers/food/snacks/chickenmomo
/datum/recipe/veggiemomo
reagents = list("spacespice" = 2, "water" = 5)
fruit = list("carrot" = 1, "cabbage" = 1)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/doughslice,
/obj/item/weapon/reagent_containers/food/snacks/doughslice,
/obj/item/weapon/reagent_containers/food/snacks/doughslice
)
reagent_mix = RECIPE_REAGENT_REPLACE //Get that water outta here
result = /obj/item/weapon/reagent_containers/food/snacks/veggiemomo
/datum/recipe/risotto
reagents = list("wine" = 5, "rice" = 10, "spacespice" = 1)
fruit = list("mushroom" = 1)
@@ -1017,32 +802,6 @@ I said no!
reagent_mix = RECIPE_REAGENT_REPLACE //Get that water outta here
result = /obj/item/weapon/reagent_containers/food/snacks/poachedegg
/datum/recipe/honeytoast
reagents = list("honey" = 5)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/slice/bread
)
reagent_mix = RECIPE_REAGENT_REPLACE //Simplify end product
result = /obj/item/weapon/reagent_containers/food/snacks/honeytoast
/datum/recipe/donerkebab
fruit = list("tomato" = 1, "cabbage" = 1)
reagents = list("sodiumchloride" = 1)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/meatsteak,
/obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough
)
result = /obj/item/weapon/reagent_containers/food/snacks/donerkebab
/datum/recipe/sashimi
reagents = list("soysauce" = 5)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/carpmeat
)
result = /obj/item/weapon/reagent_containers/food/snacks/sashimi
/datum/recipe/nugget
reagents = list("flour" = 5)
items = list(
@@ -1052,12 +811,15 @@ I said no!
result = /obj/item/weapon/reagent_containers/food/snacks/nugget
// Chip update
/datum/recipe/tortila
reagents = list("flour" = 5,"water" = 5)
/datum/recipe/microwavetortilla
reagents = list("flour" = 5, "water" = 5)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough
)
result = /obj/item/weapon/reagent_containers/food/snacks/tortilla
reagent_mix = RECIPE_REAGENT_REPLACE //no gross flour or water
/datum/recipe/taconew
/datum/recipe/taco
items = list(
/obj/item/weapon/reagent_containers/food/snacks/tortilla,
/obj/item/weapon/reagent_containers/food/snacks/cutlet,
@@ -1119,36 +881,61 @@ I said no!
)
result = /obj/item/weapon/reagent_containers/food/snacks/burrito_vegan
/datum/recipe/burrito_spicy
fruit = list("chili" = 2)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/burrito
)
result = /obj/item/weapon/reagent_containers/food/snacks/burrito_spicy
/datum/recipe/burrito_cheese
items = list(
/obj/item/weapon/reagent_containers/food/snacks/burrito,
/obj/item/weapon/reagent_containers/food/snacks/tortilla,
/obj/item/weapon/reagent_containers/food/snacks/meatball,
/obj/item/weapon/reagent_containers/food/snacks/meatball,
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge
)
result = /obj/item/weapon/reagent_containers/food/snacks/burrito_cheese
/datum/recipe/burrito_cheese_spicy
fruit = list("chili" = 2)
fruit = list("chili" = 2, "soybeans" = 1)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/burrito,
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge
/obj/item/weapon/reagent_containers/food/snacks/tortilla,
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge,
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge,
)
result = /obj/item/weapon/reagent_containers/food/snacks/burrito_cheese_spicy
/datum/recipe/burrito_hell
fruit = list("chili" = 10)
fruit = list("soybeans" = 1, "chili" = 10)
reagents = list("spacespice" = 1)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/burrito_spicy
/obj/item/weapon/reagent_containers/food/snacks/tortilla,
/obj/item/weapon/reagent_containers/food/snacks/meatball,
/obj/item/weapon/reagent_containers/food/snacks/meatball
)
result
result = /obj/item/weapon/reagent_containers/food/snacks/burrito_hell
reagent_mix = RECIPE_REAGENT_REPLACE //Already hot sauce
/datum/recipe/meatburrito
fruit = list("soybeans" = 1)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/tortilla,
/obj/item/weapon/reagent_containers/food/snacks/cutlet,
/obj/item/weapon/reagent_containers/food/snacks/cutlet
)
result = /obj/item/weapon/reagent_containers/food/snacks/meatburrito
/datum/recipe/cheeseburrito
fruit = list("soybeans" = 1)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/tortilla,
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge,
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge
)
result = /obj/item/weapon/reagent_containers/food/snacks/cheeseburrito
/datum/recipe/fuegoburrito
fruit = list("soybeans" = 1, "chili" = 2)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/tortilla
)
result = /obj/item/weapon/reagent_containers/food/snacks/fuegoburrito
/datum/recipe/breakfast_wrap
items = list(
/obj/item/weapon/reagent_containers/food/snacks/bacon,
@@ -1160,18 +947,16 @@ I said no!
/datum/recipe/burrito_mystery
items = list(
/obj/item/weapon/reagent_containers/food/snacks/burrito,
/obj/item/weapon/reagent_containers/food/snacks/tortilla,
/obj/item/weapon/reagent_containers/food/snacks/mysterysoup
)
result = /obj/item/weapon/reagent_containers/food/snacks/burrito_mystery
//Ligger food, and also bacon.
/datum/recipe/bacon
/datum/recipe/baconmicrowave
items = list(
/obj/item/weapon/reagent_containers/food/snacks/rawbacon
)
result = /obj/item/weapon/reagent_containers/food/snacks/bacon
result = /obj/item/weapon/reagent_containers/food/snacks/bacon/microwave
/datum/recipe/chilied_eggs
items = list(
@@ -1212,9 +997,9 @@ I said no!
/datum/recipe/father_breakfast
items = list(
/obj/item/weapon/reagent_containers/food/snacks/sausage,
/obj/item/weapon/reagent_containers/food/snacks/omelette,
/obj/item/weapon/reagent_containers/food/snacks/meatsteak
)
reagents = list("egg" = 6)
result = /obj/item/weapon/reagent_containers/food/snacks/father_breakfast
/datum/recipe/stuffed_meatball
@@ -1229,24 +1014,11 @@ I said no!
items = list(
/obj/item/weapon/reagent_containers/food/snacks/meatball,
/obj/item/weapon/reagent_containers/food/snacks/meatball,
/obj/item/weapon/reagent_containers/food/snacks/meatball,
/obj/item/weapon/reagent_containers/food/snacks/omelette
/obj/item/weapon/reagent_containers/food/snacks/meatball
)
reagents = list("egg" = 6)
result = /obj/item/weapon/reagent_containers/food/snacks/egg_pancake
/datum/recipe/grilled_carp
items = list(
/obj/item/weapon/reagent_containers/food/snacks/carpmeat,
/obj/item/weapon/reagent_containers/food/snacks/carpmeat,
/obj/item/weapon/reagent_containers/food/snacks/carpmeat,
/obj/item/weapon/reagent_containers/food/snacks/carpmeat,
/obj/item/weapon/reagent_containers/food/snacks/carpmeat,
/obj/item/weapon/reagent_containers/food/snacks/carpmeat
)
reagents = list("spacespice" = 1)
fruit = list("cabbage" = 1, "lime" = 1)
result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/grilled_carp
/datum/recipe/bacon_stick
items = list(
/obj/item/weapon/reagent_containers/food/snacks/bacon,
@@ -1254,16 +1026,6 @@ I said no!
)
result = /obj/item/weapon/reagent_containers/food/snacks/bacon_stick
/datum/recipe/cheese_cracker
items = list(
/obj/item/weapon/reagent_containers/food/snacks/spreads/butter,
/obj/item/weapon/reagent_containers/food/snacks/slice/bread,
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge
)
reagents = list("spacespice" = 1)
result = /obj/item/weapon/reagent_containers/food/snacks/cheese_cracker
result_quantity = 4
/datum/recipe/bacon_and_eggs
items = list(
/obj/item/weapon/reagent_containers/food/snacks/bacon,
@@ -1298,114 +1060,6 @@ I said no!
)
result = /obj/item/weapon/reagent_containers/food/snacks/blt
/datum/recipe/onionrings
fruit = list("onion" = 1)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/doughslice
)
result = /obj/item/weapon/reagent_containers/food/snacks/onionrings
/datum/recipe/berrymuffin
reagents = list("milk" = 5, "sugar" = 5)
reagent_mix = RECIPE_REAGENT_REPLACE
items = list(
/obj/item/weapon/reagent_containers/food/snacks/dough
)
fruit = list("berries" = 1)
result = /obj/item/weapon/reagent_containers/food/snacks/muffin
/datum/recipe/onionsoup
fruit = list("onion" = 1)
reagents = list("water" = 10)
result = /obj/item/weapon/reagent_containers/food/snacks/soup/onion
/datum/recipe/porkbowl
reagents = list("water" = 5, "rice" = 10)
reagent_mix = RECIPE_REAGENT_REPLACE
items = list(
/obj/item/weapon/reagent_containers/food/snacks/bacon
)
result = /obj/item/weapon/reagent_containers/food/snacks/porkbowl
/datum/recipe/sushi
fruit = list("cabbage" = 1)
reagents = list("rice" = 20)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/meat,
/obj/item/weapon/reagent_containers/food/snacks/meat,
/obj/item/weapon/reagent_containers/food/snacks/meat
)
result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/sushi
/datum/recipe/goulash
fruit = list("tomato" = 1)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/cutlet,
/obj/item/weapon/reagent_containers/food/snacks/spagetti
)
result = /obj/item/weapon/reagent_containers/food/snacks/goulash
/datum/recipe/donerkebab
fruit = list("tomato" = 1, "cabbage" = 1)
reagents = list("sodiumchloride" = 1)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/meatsteak,
/obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough
)
result = /obj/item/weapon/reagent_containers/food/snacks/donerkebab
/datum/recipe/roastbeef
fruit = list("carrot" = 2, "potato" = 2)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/meat
)
result = /obj/item/weapon/reagent_containers/food/snacks/roastbeef
/datum/recipe/reishicup
reagents = list("psilocybin" = 3, "sugar" = 3)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/chocolatebar
)
result = /obj/item/weapon/reagent_containers/food/snacks/reishicup
/datum/recipe/hotandsoursoup
fruit = list("cabbage" = 1, "mushroom" = 1)
reagents = list("sodiumchloride" = 2, "blackpepper" = 2, "water" = 10)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/tofu
)
result = /obj/item/weapon/reagent_containers/food/snacks/hotandsoursoup
/datum/recipe/kitsuneudon
reagents = list("egg" = 3)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/spagetti,
/obj/item/weapon/reagent_containers/food/snacks/tofu
)
result = /obj/item/weapon/reagent_containers/food/snacks/kitsuneudon
/datum/recipe/pillbugball
reagents = list("carbon" = 5)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/meat/grubmeat
)
result = /obj/item/weapon/reagent_containers/food/snacks/bugball
/datum/recipe/mammi
fruit = list("orange" = 1)
reagents = list("water" = 10, "flour" = 10, "milk" = 5, "sodiumchloride" = 1)
result = /obj/item/weapon/reagent_containers/food/snacks/mammi
/datum/recipe/makaroni
reagents = list("flour" = 15, "milk" = 5)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/meat/grubmeat,
/obj/item/weapon/reagent_containers/food/snacks/egg,
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge,
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge
)
result = /obj/item/weapon/reagent_containers/food/snacks/makaroni
/datum/recipe/gigapuddi
reagents = list("milk" = 15)
items = list(
@@ -1429,25 +1083,3 @@ I said no!
/obj/item/weapon/reagent_containers/food/snacks/egg
)
result = /obj/item/weapon/reagent_containers/food/snacks/gigapuddi/anger
/datum/recipe/buchedenoel
fruit = list("berries" = 2)
reagents = list("milk" = 5, "flour" = 15, "cream" = 10, "coco" = 5, "egg" = 6)
result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/buchedenoel
/datum/recipe/turkey
fruit = list("carrot" = 2)
reagents = list("sodiumchloride" = 1, "blackpepper" = 1)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/meat/chicken,
/obj/item/weapon/reagent_containers/food/snacks/slice/bread,
)
result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/turkey
/datum/recipe/cinnamonbun
reagents = list("sugar" = 15, "cream" = 10)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/dough
)
result = /obj/item/weapon/reagent_containers/food/snacks/cinnamonbun
result_quantity = 4
code/modules/food/recipes_microwave_vr.dm
+79
View File
@@ -10,6 +10,85 @@
*/
// All of this shit needs to be gone through and reorganized into different recipes per machine - Rykka 7/16/2020
/datum/recipe/sushi
fruit = list("cabbage" = 1)
reagents = list("rice" = 20)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/meat,
/obj/item/weapon/reagent_containers/food/snacks/meat,
/obj/item/weapon/reagent_containers/food/snacks/meat
)
result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/sushi
/datum/recipe/goulash
fruit = list("tomato" = 1)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/cutlet,
/obj/item/weapon/reagent_containers/food/snacks/spagetti
)
result = /obj/item/weapon/reagent_containers/food/snacks/goulash
/datum/recipe/donerkebab
fruit = list("tomato" = 1, "cabbage" = 1)
reagents = list("sodiumchloride" = 1)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/meatsteak,
/obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough
)
result = /obj/item/weapon/reagent_containers/food/snacks/donerkebab
/datum/recipe/roastbeef
fruit = list("carrot" = 2, "potato" = 2)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/meat
)
result = /obj/item/weapon/reagent_containers/food/snacks/roastbeef
/datum/recipe/reishicup
reagents = list("psilocybin" = 3, "sugar" = 3)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/chocolatebar
)
result = /obj/item/weapon/reagent_containers/food/snacks/reishicup
/datum/recipe/hotandsoursoup
fruit = list("cabbage" = 1, "mushroom" = 1)
reagents = list("sodiumchloride" = 2, "blackpepper" = 2, "water" = 10)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/tofu
)
result = /obj/item/weapon/reagent_containers/food/snacks/hotandsoursoup
/datum/recipe/kitsuneudon
reagents = list("egg" = 3)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/spagetti,
/obj/item/weapon/reagent_containers/food/snacks/tofu
)
result = /obj/item/weapon/reagent_containers/food/snacks/kitsuneudon
/datum/recipe/pillbugball
reagents = list("carbon" = 5)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/meat/grubmeat
)
result = /obj/item/weapon/reagent_containers/food/snacks/bugball
/datum/recipe/mammi
fruit = list("orange" = 1)
reagents = list("water" = 10, "flour" = 10, "milk" = 5, "sodiumchloride" = 1)
result = /obj/item/weapon/reagent_containers/food/snacks/mammi
/datum/recipe/makaroni
reagents = list("flour" = 15, "milk" = 5)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/meat/grubmeat,
/obj/item/weapon/reagent_containers/food/snacks/egg,
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge,
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge
)
result = /obj/item/weapon/reagent_containers/food/snacks/makaroni
/datum/recipe/carpsushi
fruit = list("cabbage" = 1)
reagents = list("rice" = 20)
code/modules/food/recipes_oven.dm
+144 -30
View File
@@ -5,7 +5,8 @@
)
result = /obj/item/weapon/reagent_containers/food/snacks/ovenchips
//Roasts
//---------------
/datum/recipe/dionaroast
appliance = OVEN
@@ -15,15 +16,59 @@
result = /obj/item/weapon/reagent_containers/food/snacks/dionaroast
reagent_mix = RECIPE_REAGENT_REPLACE //No eating polyacid
/datum/recipe/monkeysdelight
appliance = OVEN
fruit = list("banana" = 1)
reagents = list("sodiumchloride" = 1, "blackpepper" = 1, "flour" = 10)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/monkeycube
)
result = /obj/item/weapon/reagent_containers/food/snacks/monkeysdelight
reagent_mix = RECIPE_REAGENT_REPLACE
/datum/recipe/ribplate //Putting this here for not seeing a roast section.
/datum/recipe/ribplate
appliance = OVEN
reagents = list("honey" = 5, "spacespice" = 2, "blackpepper" = 1)
items = list(/obj/item/weapon/reagent_containers/food/snacks/meat)
reagent_mix = RECIPE_REAGENT_REPLACE
result = /obj/item/weapon/reagent_containers/food/snacks/ribplate
/datum/recipe/turkey
appliance = OVEN
reagents = list("sodiumchloride" = 1, "blackpepper" = 1)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/meat/chicken,
/obj/item/weapon/reagent_containers/food/snacks/stuffing
)
result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/turkey
/datum/recipe/tofurkey
appliance = OVEN
reagents = list("sodiumchloride" = 1, "blackpepper" = 1)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/tofu,
/obj/item/weapon/reagent_containers/food/snacks/tofu,
/obj/item/weapon/reagent_containers/food/snacks/stuffing
)
result = /obj/item/weapon/reagent_containers/food/snacks/tofurkey
/datum/recipe/zestfish
appliance = OVEN
fruit = list("lemon" = 1)
reagents = list("sodiumchloride" = 3)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/carpmeat
)
result = /obj/item/weapon/reagent_containers/food/snacks/zestfish
/datum/recipe/limezestfish
appliance = OVEN
fruit = list("lime" = 1)
reagents = list("sodiumchloride" = 3)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/carpmeat
)
result = /obj/item/weapon/reagent_containers/food/snacks/zestfish
//Predesigned breads
@@ -197,7 +242,6 @@
)
result = /obj/item/weapon/reagent_containers/food/snacks/cherrypie
/datum/recipe/amanita_pie
appliance = OVEN
reagents = list("amatoxin" = 5)
@@ -210,18 +254,24 @@
items = list(/obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough)
result = /obj/item/weapon/reagent_containers/food/snacks/plump_pie
/datum/recipe/applepie
appliance = OVEN
fruit = list("apple" = 1)
items = list(/obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough)
result = /obj/item/weapon/reagent_containers/food/snacks/applepie
/datum/recipe/pumpkinpie
appliance = OVEN
fruit = list("pumpkin" = 1)
reagents = list("milk" = 5, "sugar" = 5, "egg" = 3, "flour" = 10)
reagents = list("sugar" = 5)
items = list(/obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough)
result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/pumpkinpie
reagent_mix = RECIPE_REAGENT_REPLACE //We dont want raw egg in the result
/datum/recipe/appletart
appliance = OVEN
fruit = list("goldapple" = 1)
reagents = list("sugar" = 5, "milk" = 5, "flour" = 10, "egg" = 3)
reagents = list("sugar" = 10)
items = list(/obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough)
result = /obj/item/weapon/reagent_containers/food/snacks/appletart
reagent_mix = RECIPE_REAGENT_REPLACE
@@ -292,7 +342,20 @@
reagent_mix = RECIPE_REAGENT_REPLACE //No egg or mix in final recipe
result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/cosmicbrownies
/datum/recipe/buchedenoel
appliance = OVEN
fruit = list("berries" = 2)
reagents = list("milk" = 5, "flour" = 15, "cream" = 10, "coco" = 5, "egg" = 6)
result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/buchedenoel
/datum/recipe/cinnamonbun
appliance = OVEN
reagents = list("sugar" = 15, "cream" = 10)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/dough
)
result = /obj/item/weapon/reagent_containers/food/snacks/cinnamonbun
result_quantity = 4
//Pizzas
@@ -366,24 +429,15 @@
//Spicy
//================
/datum/recipe/enchiladas
appliance = OVEN
fruit = list("chili" = 2, "corn" = 1)
items = list(/obj/item/weapon/reagent_containers/food/snacks/cutlet)
result = /obj/item/weapon/reagent_containers/food/snacks/enchiladas
/datum/recipe/monkeysdelight
appliance = OVEN
fruit = list("banana" = 1)
reagents = list("sodiumchloride" = 1, "blackpepper" = 1, "flour" = 10)
fruit = list("chili" = 2)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/monkeycube
/obj/item/weapon/reagent_containers/food/snacks/cutlet,
/obj/item/weapon/reagent_containers/food/snacks/tortilla
)
result = /obj/item/weapon/reagent_containers/food/snacks/monkeysdelight
reagent_mix = RECIPE_REAGENT_REPLACE
result = /obj/item/weapon/reagent_containers/food/snacks/enchiladas
// Cakes.
@@ -485,15 +539,6 @@
reagents = list("milk" = 5, "egg" = 3,"honey" = 5)
result = /obj/item/weapon/reagent_containers/food/snacks/honeybun
/datum/recipe/enchiladas_new
appliance = OVEN
fruit = list("chili" = 2)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/cutlet,
/obj/item/weapon/reagent_containers/food/snacks/tortilla
)
result = /obj/item/weapon/reagent_containers/food/snacks/enchiladas
//Bacon
/datum/recipe/bacon_oven
appliance = OVEN
@@ -558,7 +603,7 @@
/obj/item/weapon/reagent_containers/food/snacks/cheesewedge
)
result = /obj/item/weapon/reagent_containers/food/snacks/macncheese
/datum/recipe/suppermatter
appliance = OVEN
reagents = list("radium" = 5, "milk" = 5)
@@ -576,3 +621,72 @@
)
reagent_mix = RECIPE_REAGENT_REPLACE
result = /obj/item/weapon/reagent_containers/food/snacks/sliceable/excitingsuppermatter
/datum/recipe/waffles
appliance = OVEN
reagents = list("sugar" = 10)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/dough,
/obj/item/weapon/reagent_containers/food/snacks/dough
)
result = /obj/item/weapon/reagent_containers/food/snacks/waffles
/datum/recipe/loadedbakedpotatooven
appliance = OVEN
fruit = list("potato" = 1)
items = list(/obj/item/weapon/reagent_containers/food/snacks/cheesewedge)
result = /obj/item/weapon/reagent_containers/food/snacks/loadedbakedpotato
/datum/recipe/meatbun
appliance = OVEN
fruit = list("cabbage" = 1)
reagents = list("water" = 5)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/meatball,
/obj/item/weapon/reagent_containers/food/snacks/sliceable/flatdough,
)
reagent_mix = RECIPE_REAGENT_REPLACE //Water used up in cooking
result = /obj/item/weapon/reagent_containers/food/snacks/meatbun
/datum/recipe/spicedmeatbun
appliance = OVEN
reagents = list("spacespice" = 2, "water" = 5)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/doughslice,
/obj/item/weapon/reagent_containers/food/snacks/rawcutlet
)
reagent_mix = RECIPE_REAGENT_REPLACE //Water used up in cooking
result = /obj/item/weapon/reagent_containers/food/snacks/spicedmeatbun
/datum/recipe/custardbun
appliance = OVEN
reagents = list("spacespice" = 1, "water" = 5, "egg" = 3)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/doughslice
)
reagent_mix = RECIPE_REAGENT_REPLACE //Water, egg used up in cooking
result = /obj/item/weapon/reagent_containers/food/snacks/custardbun
/datum/recipe/chickenmomo
appliance = OVEN
reagents = list("spacespice" = 2, "water" = 5)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/doughslice,
/obj/item/weapon/reagent_containers/food/snacks/doughslice,
/obj/item/weapon/reagent_containers/food/snacks/doughslice,
/obj/item/weapon/reagent_containers/food/snacks/meat/chicken
)
reagent_mix = RECIPE_REAGENT_REPLACE //Simplify end product
result = /obj/item/weapon/reagent_containers/food/snacks/chickenmomo
/datum/recipe/veggiemomo
appliance = OVEN
reagents = list("spacespice" = 2, "water" = 5)
fruit = list("carrot" = 1, "cabbage" = 1)
items = list(
/obj/item/weapon/reagent_containers/food/snacks/doughslice,
/obj/item/weapon/reagent_containers/food/snacks/doughslice,
/obj/item/weapon/reagent_containers/food/snacks/doughslice
)
reagent_mix = RECIPE_REAGENT_REPLACE //Get that water outta here
result = /obj/item/weapon/reagent_containers/food/snacks/veggiemomo
code/modules/hydroponics/grown.dm
+5
View File
@@ -219,6 +219,11 @@
new /obj/item/weapon/reagent_containers/food/snacks/carrotfries(get_turf(src))
qdel(src)
return
else if(!isnull(seed.chems["pineapplejuice"]))
to_chat(user, "You slice \the [src] into rings.")
new /obj/item/weapon/reagent_containers/food/snacks/pineapple_ring(get_turf(src))
qdel(src)
return
else if(!isnull(seed.chems["soymilk"]))
to_chat(user, "You roughly chop up \the [src].")
new /obj/item/weapon/reagent_containers/food/snacks/soydope(get_turf(src))
code/modules/hydroponics/seed_packets.dm
+2 -2
View File
@@ -320,8 +320,8 @@ GLOBAL_LIST_BOILERPLATE(all_seed_packs, /obj/item/seeds)
/obj/item/seeds/eggyplant
seed_type = "egg-plant"
/obj/item/seeds/spineapple
seed_type = "spineapple"
/obj/item/seeds/pineapple
seed_type = "pineapple"
/obj/item/seeds/durian
seed_type = "durian"
code/modules/hydroponics/seed_storage.dm
+2 -2
View File
@@ -127,7 +127,7 @@
/obj/item/seeds/riceseed = 3,
/obj/item/seeds/rose = 3,
/obj/item/seeds/soyaseed = 3,
/obj/item/seeds/spineapple = 3,
/obj/item/seeds/pineapple = 3,
/obj/item/seeds/sugarcaneseed = 3,
/obj/item/seeds/sunflowerseed = 3,
/obj/item/seeds/shandseed = 2,
@@ -185,7 +185,7 @@
/obj/item/seeds/riceseed = 3,
/obj/item/seeds/rose = 3,
/obj/item/seeds/soyaseed = 3,
/obj/item/seeds/spineapple = 3,
/obj/item/seeds/pineapple = 3,
/obj/item/seeds/sugarcaneseed = 3,
/obj/item/seeds/sunflowerseed = 3,
/obj/item/seeds/shandseed = 2,
code/modules/hydroponics/seed_storage_vr.dm
+2 -2
View File
@@ -32,7 +32,7 @@
/obj/item/seeds/riceseed = 3,
/obj/item/seeds/rose = 3,
/obj/item/seeds/soyaseed = 3,
/obj/item/seeds/spineapple = 3,
/obj/item/seeds/pineapple = 3,
/obj/item/seeds/sugarcaneseed = 3,
/obj/item/seeds/sunflowerseed = 3,
/obj/item/seeds/shandseed = 2,
@@ -89,7 +89,7 @@
/obj/item/seeds/riceseed = 3,
/obj/item/seeds/rose = 3,
/obj/item/seeds/soyaseed = 3,
/obj/item/seeds/spineapple = 3,
/obj/item/seeds/pineapple = 3,
/obj/item/seeds/sugarcaneseed = 3,
/obj/item/seeds/sunflowerseed = 3,
/obj/item/seeds/shandseed = 2,
code/modules/hydroponics/seedtypes/pineapple.dm
+49
View File
@@ -0,0 +1,49 @@
//pineapple and variants
/datum/seed/pineapple
name = "pineapple"
seed_name = "pineapple"
display_name = "pineapple"
kitchen_tag = "pineapple"
mutants = list("spineapple")
chems = list("nutriment" = list(1,5), "pineapplejuice" = list(1, 20))
/datum/seed/pineapple/New()
..()
set_trait(TRAIT_HARVEST_REPEAT,1)
set_trait(TRAIT_MATURATION,10)
set_trait(TRAIT_PRODUCTION,6)
set_trait(TRAIT_YIELD,1)
set_trait(TRAIT_POTENCY,13)
set_trait(TRAIT_PRODUCT_ICON,"pineapple")
set_trait(TRAIT_PRODUCT_COLOUR,"#FFF23B")
set_trait(TRAIT_PLANT_COLOUR,"#87C969")
set_trait(TRAIT_PLANT_ICON,"corn")
set_trait(TRAIT_IDEAL_HEAT, 298)
set_trait(TRAIT_IDEAL_LIGHT, 4)
set_trait(TRAIT_WATER_CONSUMPTION, 8)
//A pineapple that stings and produces enzymes.
/datum/seed/spineapple
name = "spineapple"
seed_name = "spineapple"
display_name = "spineapple"
kitchen_tag = "spineapple"
chems = list("nutriment" = list(1,5), "enzyme" = list(1,5), "pineapplejuice" = list(1, 20))
/datum/seed/spineapple/New()
..()
set_trait(TRAIT_HARVEST_REPEAT,1)
set_trait(TRAIT_MATURATION,10)
set_trait(TRAIT_PRODUCTION,6)
set_trait(TRAIT_YIELD,1)
set_trait(TRAIT_POTENCY,13)
set_trait(TRAIT_PRODUCT_ICON,"pineapple")
set_trait(TRAIT_PRODUCT_COLOUR,"#FFF23B")
set_trait(TRAIT_PLANT_COLOUR,"#87C969")
set_trait(TRAIT_PLANT_ICON,"corn")
set_trait(TRAIT_IDEAL_HEAT, 298)
set_trait(TRAIT_IDEAL_LIGHT, 4)
set_trait(TRAIT_WATER_CONSUMPTION, 6)
set_trait(TRAIT_STINGS,1)
code/modules/hydroponics/seedtypes/spineapple.dm
-22
View File
@@ -1,22 +0,0 @@
/datum/seed/spineapple
name = "spineapple"
seed_name = "spineapple"
display_name = "spineapple"
kitchen_tag = "pineapple"
chems = list("nutriment" = list(1,5), "enzyme" = list(1,5), "pineapplejuice" = list(1, 20))
/datum/seed/spineapple/New()
..()
set_trait(TRAIT_HARVEST_REPEAT,1)
set_trait(TRAIT_MATURATION,10)
set_trait(TRAIT_PRODUCTION,6)
set_trait(TRAIT_YIELD,1)
set_trait(TRAIT_POTENCY,13)
set_trait(TRAIT_PRODUCT_ICON,"pineapple")
set_trait(TRAIT_PRODUCT_COLOUR,"#FFF23B")
set_trait(TRAIT_PLANT_COLOUR,"#87C969")
set_trait(TRAIT_PLANT_ICON,"corn")
set_trait(TRAIT_IDEAL_HEAT, 298)
set_trait(TRAIT_IDEAL_LIGHT, 4)
set_trait(TRAIT_WATER_CONSUMPTION, 8)
set_trait(TRAIT_STINGS,1)
code/modules/mob/language/station_vr.dm
+14
View File
@@ -110,6 +110,20 @@
"ver", "stv", "pro", "ski"
)
/datum/language/clownish
name = LANGUAGE_CLOWNISH
desc = "A special elective language course for those studying at the Clown Planet Institute."
speech_verb = "honks"
ask_verb = "seins"
exclaim_verb = "crenks"
whisper_verb = "squeaks"
colour = "#F785F2" // Pink for the clown.
key = "<"
flags = WHITELISTED | CLOWN
syllables = list(
"honk", "knock", "salt", "slip", "lube", "banana", "flower", "pie", "did you hear", "🅱️", "haha", "bully", "going up",
)
/datum/language/drudakar
name = LANGUAGE_DRUDAKAR
desc = "The native language of the D'Rudak'Ar, a loosely tied together community of dragons and demi-dragons based in the Diul system. Features include many hard consonants and rolling 'r's."
code/modules/mob/living/carbon/human/human.dm
+2 -2
View File
@@ -1099,8 +1099,8 @@
if(species.default_language)
add_language(species.default_language)
//if(species.icon_scale_x != 1 || species.icon_scale_y != 1) //VOREStation Removal
// update_transform() //VOREStation Removal
if(species.icon_scale_x != 1 || species.icon_scale_y != 1)
update_transform()
if(example) //VOREStation Edit begin
if(!(example == src))
code/modules/mob/living/carbon/human/species/station/traits_vr/negative.dm
+5 -2
View File
@@ -1,3 +1,6 @@
#define ORGANICS 1
#define SYNTHETICS 2
/datum/trait/speed_slow
name = "Slowdown"
desc = "Allows you to move slower on average than baseline."
@@ -92,10 +95,10 @@
/datum/trait/haemophilia
name = "Haemophilia - Organics only"
desc = "When you bleed, you bleed a LOT. This trait is only for organics, buggy with synths!"
desc = "When you bleed, you bleed a LOT."
cost = -2
var_changes = list("bloodloss_rate" = 2)
not_for_synths = 1
can_take = ORGANICS
/datum/trait/hollow
name = "Hollow Bones/Aluminum Alloy"
code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm
+101 -1
View File
@@ -1,3 +1,6 @@
#define ORGANICS 1
#define SYNTHETICS 2
/datum/trait/metabolism_up
name = "Fast Metabolism"
desc = "You process ingested and injected reagents faster, but get hungry faster (Teshari speed)."
@@ -234,4 +237,101 @@
cost = 0
custom_only = FALSE
var_changes = list("alcohol_mod" = 0.25) // 25% as effective if alcohol_mod is set to 1. If it's not 1 in species.dm, update this!
// Alcohol Traits End Here.
// Alcohol Traits End Here.
// Body shape traits
/datum/trait/taller
name = "Taller"
desc = "Your body is taller than average."
cost = 0
custom_only = FALSE
var_changes = list("icon_scale_y" = 1.09)
excludes = list(/datum/trait/tall, /datum/trait/short, /datum/trait/shorter)
/datum/trait/taller/apply(var/datum/species/S,var/mob/living/carbon/human/H)
..(S,H)
H.update_transform()
/datum/trait/tall
name = "Tall"
desc = "Your body is a bit taller than average."
cost = 0
custom_only = FALSE
var_changes = list("icon_scale_y" = 1.05)
excludes = list(/datum/trait/taller, /datum/trait/short, /datum/trait/shorter)
/datum/trait/tall/apply(var/datum/species/S,var/mob/living/carbon/human/H)
..(S,H)
H.update_transform()
/datum/trait/short
name = "Short"
desc = "Your body is a bit shorter than average."
cost = 0
custom_only = FALSE
var_changes = list("icon_scale_y" = 0.95)
excludes = list(/datum/trait/taller, /datum/trait/tall, /datum/trait/shorter)
/datum/trait/short/apply(var/datum/species/S,var/mob/living/carbon/human/H)
..(S,H)
H.update_transform()
/datum/trait/shorter
name = "Shorter"
desc = "You are shorter than average."
cost = 0
custom_only = FALSE
var_changes = list("icon_scale_y" = 0.915)
excludes = list(/datum/trait/taller, /datum/trait/tall, /datum/trait/short)
/datum/trait/shorter/apply(var/datum/species/S,var/mob/living/carbon/human/H)
..(S,H)
H.update_transform()
/datum/trait/fat
name = "Overweight"
desc = "You are heavier than average."
cost = 0
custom_only = FALSE
var_changes = list("icon_scale_x" = 1.054)
excludes = list(/datum/trait/obese, /datum/trait/thin, /datum/trait/thinner)
/datum/trait/fat/apply(var/datum/species/S,var/mob/living/carbon/human/H)
..(S,H)
H.update_transform()
/datum/trait/obese
name = "Obese"
desc = "You are much heavier than average."
cost = 0
custom_only = FALSE
var_changes = list("icon_scale_x" = 1.095)
excludes = list(/datum/trait/fat, /datum/trait/thin, /datum/trait/thinner)
/datum/trait/obese/apply(var/datum/species/S,var/mob/living/carbon/human/H)
..(S,H)
H.update_transform()
/datum/trait/thin
name = "Thin"
desc = "You are skinnier than average."
cost = 0
custom_only = FALSE
var_changes = list("icon_scale_x" = 0.945)
excludes = list(/datum/trait/fat, /datum/trait/obese, /datum/trait/thinner)
/datum/trait/thin/apply(var/datum/species/S,var/mob/living/carbon/human/H)
..(S,H)
H.update_transform()
/datum/trait/thinner
name = "Very Thin"
desc = "You are much skinnier than average."
cost = 0
custom_only = FALSE
var_changes = list("icon_scale_x" = 0.905)
excludes = list(/datum/trait/fat, /datum/trait/obese, /datum/trait/thin)
/datum/trait/thinner/apply(var/datum/species/S,var/mob/living/carbon/human/H)
..(S,H)
H.update_transform()
code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm
+3
View File
@@ -1,3 +1,6 @@
#define ORGANICS 1
#define SYNTHETICS 2
/datum/trait/speed_fast
name = "Haste"
desc = "Allows you to move faster on average than baseline."
code/modules/mob/living/carbon/human/species/station/traits_vr/trait.dm
+4 -1
View File
@@ -1,3 +1,6 @@
#define ORGANICS 1
#define SYNTHETICS 2
/datum/trait
var/name
var/desc = "Contact a developer if you see this trait."
@@ -5,7 +8,7 @@
var/cost = 0 // 0 is neutral, negative cost means negative, positive cost means positive.
var/list/var_changes // A list to apply to the custom species vars.
var/list/excludes // Store a list of paths of traits to exclude, but done automatically if they change the same vars.
var/not_for_synths = FALSE // Can freaking synths use those.
var/can_take = ORGANICS|SYNTHETICS // Can freaking synths use those.
var/custom_only = TRUE // Trait only available for custom species
//Proc can be overridden lower to include special changes, make sure to call up though for the vars changes
code/modules/mob/living/carbon/human/update_icons.dm
+8 -6
View File
@@ -123,7 +123,7 @@ var/global/list/damage_icon_parts = list() //see UpdateDamageIcon()
crash_with("CANARY: Old human update_icons_huds was called.")
/mob/living/carbon/human/update_transform()
/* VOREStation Edit START - TODO - Consider switching to icon_scale
/* VOREStation Edit START
// First, get the correct size.
var/desired_scale_x = icon_scale_x
var/desired_scale_y = icon_scale_y
@@ -137,8 +137,10 @@ var/global/list/damage_icon_parts = list() //see UpdateDamageIcon()
if(!isnull(M.icon_scale_y_percent))
desired_scale_y *= M.icon_scale_y_percent
*/
var/desired_scale_x = size_multiplier
var/desired_scale_y = size_multiplier
var/desired_scale_x = size_multiplier * icon_scale_x
var/desired_scale_y = size_multiplier * icon_scale_y
desired_scale_x *= species.icon_scale_x
desired_scale_y *= species.icon_scale_y
//VOREStation Edit End
// Regular stuff again.
@@ -151,14 +153,14 @@ var/global/list/damage_icon_parts = list() //see UpdateDamageIcon()
if(lying && !species.prone_icon) //Only rotate them if we're not drawing a specific icon for being prone.
M.Turn(90)
M.Scale(desired_scale_x, desired_scale_y)
M.Scale(desired_scale_y, desired_scale_x)//VOREStation Edit
if(species.icon_height == 64)//VOREStation Edit
M.Translate(13,-22)
else
M.Translate(1,-6)
layer = MOB_LAYER -0.01 // Fix for a byond bug where turf entry order no longer matters
else
M.Scale(desired_scale_x, desired_scale_y)
M.Scale(desired_scale_x, desired_scale_y)//VOREStation Edit
M.Translate(0, (vis_height/2)*(desired_scale_y-1)) //VOREStation edit
layer = MOB_LAYER // Fix for a byond bug where turf entry order no longer matters
@@ -487,7 +489,7 @@ var/global/list/damage_icon_parts = list() //see UpdateDamageIcon()
if(head_organ.transparent) //VOREStation Edit. For better slime limbs.
face_standing += rgb(,,,120)
overlays_standing[HAIR_LAYER] = image(face_standing, layer = BODY_LAYER+HAIR_LAYER)
apply_layer(HAIR_LAYER)
code/modules/mob/living/living.dm
+5 -5
View File
@@ -149,21 +149,21 @@ default behaviour is:
if((tmob.mob_always_swap || (tmob.a_intent == I_HELP || tmob.restrained()) && (a_intent == I_HELP || src.restrained())) && tmob.canmove && canmove && !tmob.buckled && !buckled && can_swap && can_move_mob(tmob, 1, 0)) // mutual brohugs all around!
var/turf/oldloc = loc
//VOREstation Edit - Begin
//check bumpnom chance, if it's a simplemob that's doing the bumping
var/mob/living/simple_mob/srcsimp = src
if(istype(srcsimp))
if(srcsimp.tryBumpNom(tmob))
now_pushing = 0
return
//if it's a simplemob being bumped, and the above didn't make them start getting bumpnommed, they get a chance to bumpnom
var/mob/living/simple_mob/tmobsimp = tmob
if(istype(tmobsimp))
if(tmobsimp.tryBumpNom(src))
now_pushing = 0
return
//VOREstation Edit - End
forceMove(tmob.loc)
//VOREstation Edit - Begin
@@ -1281,8 +1281,8 @@ default behaviour is:
/mob/living/update_transform()
// First, get the correct size.
var/desired_scale_x = size_multiplier //VOREStation edit
var/desired_scale_y = size_multiplier //VOREStation edit
var/desired_scale_x = size_multiplier * icon_scale_x //VOREStation edit
var/desired_scale_y = size_multiplier * icon_scale_y //VOREStation edit
// Now for the regular stuff.
var/matrix/M = matrix()
code/modules/mob/living/simple_mob/subtypes/slime/xenobio/subtypes.dm
+2
View File
@@ -439,6 +439,7 @@
/mob/living/simple_mob/slime/xenobio/amber
)
/* VOREStation Edit. We've had enough server crashes.
/mob/living/simple_mob/slime/xenobio/amber/handle_special()
if(stat != DEAD)
feed_aura()
@@ -456,6 +457,7 @@
if(H.isSynthetic())
continue
H.nutrition = between(0, H.nutrition + rand(15, 25), 800)
*/
/mob/living/simple_mob/slime/xenobio/cerulean
desc = "This slime is generally superior in a wide range of attributes, compared to the common slime. The jack of all trades, but master of none."
code/modules/mob/living/simple_mob/subtypes/vore/c_pet.dm
+94
View File
@@ -0,0 +1,94 @@
/mob/living/simple_mob/animal/passive/honkpet
name = "Hinkle"
desc = "The Silence into Laughter program mass produces these excessively hardy animals for each member to raise and take care of. They often switch personalities when smacked."
tt_desc = "Coulrian Honkus"
icon = 'icons/mob/animal_vr.dmi'
icon_state = "c_pet"
icon_living = "c_pet"
icon_dead = "c_pet_dead"
maxHealth = 1500
health = 1500
minbodytemp = 175 // Same as Sif mobs.
response_help = "pokes"
response_disarm = "subverts"
response_harm = "smacks"
harm_intent_damage = 0
melee_damage_lower = 0
melee_damage_upper = 0
attacktext = list("honked")
armor = list(
"melee" = 80,
"bullet" = 20,
"laser" = 0,
"energy" = 0,
"bomb" = 0,
"bio" = 0,
"rad" = 0
)
armor_soak = list(
"melee" = 80,
"bullet" = 20,
"laser" = 0,
"energy" = 0,
"bomb" = 0,
"bio" = 0,
"rad" = 0
)
has_langs = list("Coulrian")
/mob/living/simple_mob/animal/passive/honkpet/attack_hand(mob/living/user as mob)
if(user.a_intent == I_DISARM)
return icon_state = pick("c_pet", "m_pet")
.=..()
/mob/living/simple_mob/animal/passive/mimepet
name = "Dave"
desc = "That's Dave."
tt_desc = "Polypodavesilencia"
icon = 'icons/mob/animal_vr.dmi'
icon_state = "dave1"
icon_living = "dave1"
icon_dead = "dave_dead"
movement_cooldown = 300
maxHealth = 1500
health = 1500
minbodytemp = 175 // Same as Sif mobs.
response_help = "pokes"
response_disarm = "shuffles"
response_harm = "smacks"
harm_intent_damage = 0
melee_damage_lower = 0
melee_damage_upper = 0
attacktext = list("...")
armor = list(
"melee" = 80,
"bullet" = 20,
"laser" = 0,
"energy" = 0,
"bomb" = 0,
"bio" = 0,
"rad" = 0
)
armor_soak = list(
"melee" = 80,
"bullet" = 20,
"laser" = 0,
"energy" = 0,
"bomb" = 0,
"bio" = 0,
"rad" = 0
)
/mob/living/simple_mob/animal/passive/mimepet/attack_hand(mob/living/user as mob)
if(user.a_intent == I_DISARM)
icon_state = pick("dave1", "dave2", "dave3", "dave5" , "dave6" , "dave7" , "dave8" , "dave9" , "dave10")
.=..()
code/modules/mob/new_player/preferences_setup_vr.dm
+1
View File
@@ -4,6 +4,7 @@
mannequin.dna = new /datum/dna(null)
mannequin.delete_inventory(TRUE)
dress_preview_mob(mannequin)
mannequin.update_transform()
mannequin.toggle_tail_vr(setting = TRUE)
mannequin.toggle_wing_vr(setting = TRUE)
COMPILE_OVERLAYS(mannequin)
code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
+12 -3
View File
@@ -433,7 +433,7 @@
color = "#c07c40"
/datum/reagent/nutriment/soysauce
name = "Soysauce"
name = "Soy Sauce"
id = "soysauce"
description = "A salty sauce made from the soy plant."
taste_description = "umami"
@@ -451,6 +451,15 @@
nutriment_factor = 5
color = "#731008"
/datum/reagent/nutriment/barbecue
name = "Barbeque Sauce"
id = "barbecue"
description = "Barbecue sauce for barbecues and long shifts."
taste_description = "barbeque"
reagent_state = LIQUID
nutriment_factor = 5
color = "#4F330F"
/datum/reagent/nutriment/rice
name = "Rice"
id = "rice"
@@ -1505,13 +1514,13 @@
/datum/reagent/drink/soda/pineappleade
name = "Pineappleade"
id = "pineappleade"
description = "Spineapple, juiced up."
description = "Pineapple, juiced up."
taste_description = "sweet`n`sour pineapples"
color = "#FFFF00"
adj_temp = -5
glass_name = "pineappleade"
glass_desc = "Spineapple, juiced up."
glass_desc = "Pineapple, juiced up."
glass_special = list(DRINK_FIZZ)
/datum/reagent/drink/soda/kiraspecial
code/modules/reagents/Chemistry-Recipes.dm
+7
View File
@@ -1292,6 +1292,13 @@
required_reagents = list("tomatojuice" = 2, "water" = 1, "sugar" = 1)
result_amount = 4
/datum/chemical_reaction/food/barbecue
name = "Barbeque Sauce"
id = "barbecue"
result = "barbecue"
required_reagents = list("tomatojuice" = 2, "applejuice" = 1, "sugar" = 1, "spacespice" = 1)
result_amount = 4
/datum/chemical_reaction/food/peanutbutter
name = "Peanut Butter"
id = "peanutbutter"
code/modules/tgui/states.dm
+4 -4
View File
@@ -20,9 +20,9 @@
return
if(isobserver(user))
// // If they turn on ghost AI control, admins can always interact.
// if(user.client.advanced_admin_interaction)
// . = max(., STATUS_INTERACTIVE)
// Admins can always interact.
if(check_rights(R_ADMIN|R_EVENT, 0, src))
. = max(., STATUS_INTERACTIVE)
// Regular ghosts can always at least view if in range.
if(user.client)
@@ -126,4 +126,4 @@
// Topic Extensions for old UIs
/datum/proc/CanUseTopic(var/mob/user, var/datum/tgui_state/state)
return tgui_status(user, state)
return tgui_status(user, state)
code/modules/virus2/items_devices.dm
+2 -2
View File
@@ -37,7 +37,7 @@
/obj/item/weapon/virusdish
name = "virus dish"
icon = 'icons/obj/items.dmi'
icon_state = "implantcase-b"
icon_state = "virussample"
var/datum/disease2/disease/virus2 = null
var/growth = 0
var/basic_info = null
@@ -81,7 +81,7 @@
/obj/item/weapon/ruinedvirusdish
name = "ruined virus sample"
icon = 'icons/obj/items.dmi'
icon_state = "implantcase-b"
icon_state = "virussample-ruined"
desc = "The bacteria in the dish are completely dead."
/obj/item/weapon/ruinedvirusdish/attackby(var/obj/item/weapon/W as obj,var/mob/living/carbon/user as mob)
code/modules/vore/appearance/sprite_accessories_vr.dm
+74 -3
View File
@@ -656,6 +656,77 @@
color_blend_mode = ICON_MULTIPLY
extra_overlay = "succu-horns_b"
/datum/sprite_accessory/ears/chorns_nubbydogs
name = "Nubby Chorns"
desc = ""
icon_state = "chorn_nubby"
do_colouration = 0
color_blend_mode = ICON_MULTIPLY
/datum/sprite_accessory/ears/chorns_herk
name = "Herk Chorns"
desc = ""
icon_state = "chorn_herk"
do_colouration = 0
color_blend_mode = ICON_MULTIPLY
/datum/sprite_accessory/ears/chorns_bork
name = "Bork Chorns"
desc = ""
icon_state = "chorn_bork"
do_colouration = 0
color_blend_mode = ICON_MULTIPLY
/datum/sprite_accessory/ears/chorns_bull
name = "Bull Chorns"
desc = ""
icon_state = "chorn_bull"
do_colouration = 0
color_blend_mode = ICON_MULTIPLY
/datum/sprite_accessory/ears/chorns_bicarrot
name = "Bicarrot Chorns"
desc = ""
icon_state = "chorn_bicarrot"
do_colouration = 0
color_blend_mode = ICON_MULTIPLY
/datum/sprite_accessory/ears/chorns_longcarrot
name = "Long Carrot Chorns"
desc = ""
icon_state = "chorn_longcarrot"
do_colouration = 0
color_blend_mode = ICON_MULTIPLY
/datum/sprite_accessory/ears/chorns_shortcarrot
name = "Short Carrot Chorns"
desc = ""
icon_state = "chorn_shortcarrot"
do_colouration = 0
color_blend_mode = ICON_MULTIPLY
/datum/sprite_accessory/ears/chorns_scorp
name = "Scorp Chorns"
desc = ""
icon_state = "chorn_scorp"
do_colouration = 0
color_blend_mode = ICON_MULTIPLY
/datum/sprite_accessory/ears/chorns_ocean
name = "Ocean Chorns"
desc = ""
icon_state = "chorn_ocean"
do_colouration = 0
color_blend_mode = ICON_MULTIPLY
/datum/sprite_accessory/ears/chorns_chub
name = "Chub Chorns"
desc = ""
icon_state = "chorn_chub"
do_colouration = 0
color_blend_mode = ICON_MULTIPLY
/*
@@ -2038,9 +2109,9 @@
////////////////////////////
*/
// Yes, I have to add all of this just to make some glowy hair.
// No, this isn't a character creation option, but... I guess in the future it could be, if anyone wants that?
// Yes, I have to add all of this just to make some glowy hair.
// No, this isn't a character creation option, but... I guess in the future it could be, if anyone wants that?
/datum/sprite_accessory/hair_accessory
name = "You should not see this..."
icon = 'icons/mob/vore/hair_accessories_vr.dmi'
code/modules/vore/resizing/resize_vr.dm
+2 -2
View File
@@ -41,7 +41,7 @@ var/const/RESIZE_A_SMALLTINY = (RESIZE_SMALL + RESIZE_TINY) / 2
. = ..()
ASSERT(!ishuman(src))
var/matrix/M = matrix()
M.Scale(size_multiplier)
M.Scale(size_multiplier * icon_scale_x, size_multiplier * icon_scale_y)
M.Translate(0, (vis_height/2)*(size_multiplier-1))
transform = M
@@ -70,7 +70,7 @@ var/const/RESIZE_A_SMALLTINY = (RESIZE_SMALL + RESIZE_TINY) / 2
var/change = new_size - size_multiplier
var/duration = (abs(change)+0.25) SECONDS
var/matrix/resize = matrix() // Defines the matrix to change the player's size
resize.Scale(new_size) //Change the size of the matrix
resize.Scale(new_size * icon_scale_x, new_size * icon_scale_y) //Change the size of the matrix
resize.Translate(0, (vis_height/2) * (new_size - 1)) //Move the player up in the tile so their feet align with the bottom
animate(src, transform = resize, time = duration) //Animate the player resizing
config/alienwhitelist.txt
+1
View File
@@ -40,6 +40,7 @@ mewchild - Vox
mrsebbi - Xenochimera
natje - Xenochimera
nerdass - Protean
newyorks - Protean
ontejbjoav - Diona
oreganovulgaris - Xenochimera
owwy - Black-Eyed Shadekin
icons/_nanomaps/tether_nanomap_z1.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 810 KiB

After

Width:  |  Height:  |  Size: 812 KiB

icons/_nanomaps/tether_nanomap_z2.png
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 723 KiB

After

Width:  |  Height:  |  Size: 725 KiB

icons/effects/setup_backgrounds_vr.dmi
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.5 KiB

icons/mob/animal_vr.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.5 KiB

After

Width:  |  Height:  |  Size: 25 KiB

icons/mob/vore/ears_vr.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 27 KiB

After

Width:  |  Height:  |  Size: 29 KiB

icons/obj/clothing/uniforms.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 101 KiB

After

Width:  |  Height:  |  Size: 98 KiB

icons/obj/clothing/uniforms_1.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 25 KiB

icons/obj/food.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 160 KiB

After

Width:  |  Height:  |  Size: 161 KiB

icons/obj/food_custom.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 28 KiB

After

Width:  |  Height:  |  Size: 27 KiB

icons/obj/food_syn.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 51 KiB

After

Width:  |  Height:  |  Size: 52 KiB

icons/obj/xenoarchaeology.dmi
BIN
View File
Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 96 KiB

After

Width:  |  Height:  |  Size: 99 KiB

maps/submaps/admin_use_vr/kk_mercship.dmm
+128 -146
View File
@@ -276,10 +276,6 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/armoury_st)
"bg" = (
/turf/space,
/turf/space,
/area/space)
"bh" = (
/obj/effect/floor_decal/techfloor{
dir = 8
@@ -562,7 +558,7 @@
/turf/simulated/floor/reinforced,
/area/ship/manta/hangar)
"ch" = (
/turf/simulated/wall/rplastihull,
/turf/simulated/wall/rshull,
/area/ship/manta/holding)
"cl" = (
/obj/effect/shuttle_landmark/premade/manta_ship_near_aft,
@@ -628,7 +624,7 @@
/area/ship/manta/bridge)
"cA" = (
/obj/machinery/atmospherics/pipe/simple/visible,
/turf/simulated/wall/rplastihull,
/turf/simulated/wall/rshull,
/area/ship/manta/radiator_star)
"cG" = (
/obj/structure/cable/orange{
@@ -818,7 +814,7 @@
/turf/simulated/floor/reinforced,
/area/ship/manta/hangar)
"dl" = (
/turf/simulated/wall/rplastihull,
/turf/simulated/wall/rshull,
/area/ship/manta/med)
"dn" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on{
@@ -963,7 +959,7 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/fuel{
dir = 8
},
/turf/simulated/wall/rplastihull,
/turf/simulated/wall/rshull,
/area/shuttle/manta_ship_boat)
"ee" = (
/obj/effect/floor_decal/techfloor{
@@ -1126,13 +1122,6 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/hallways_port)
"fh" = (
/obj/item/device/perfect_tele_beacon/stationary{
tele_name = "Mercenary Cruiser Teleporter Room";
tele_network = "syndicate"
},
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/teleporter)
"fj" = (
/obj/effect/floor_decal/techfloor{
dir = 4
@@ -1141,7 +1130,7 @@
/area/ship/manta/teleporter)
"fp" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/fuel,
/turf/simulated/wall/rplastihull,
/turf/simulated/wall/rshull,
/area/shuttle/manta_ship_boat)
"fr" = (
/obj/item/modular_computer/console/preset/mercenary{
@@ -1322,7 +1311,7 @@
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/recreation)
"ge" = (
/turf/simulated/wall/plastihull,
/turf/simulated/wall/shull,
/area/ship/manta/barracks/bed_1)
"gf" = (
/obj/effect/floor_decal/techfloor/corner{
@@ -1429,7 +1418,7 @@
/obj/structure/sign/department/telecoms{
name = "TELEPORTER"
},
/turf/simulated/wall/rplastihull,
/turf/simulated/wall/rshull,
/area/ship/manta/bridge)
"gJ" = (
/obj/effect/floor_decal/techfloor{
@@ -1556,7 +1545,7 @@
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/bridge)
"ht" = (
/turf/simulated/wall/rplastihull,
/turf/simulated/wall/rshull,
/area/ship/manta/hallways_port)
"hu" = (
/obj/structure/catwalk,
@@ -1687,6 +1676,9 @@
/obj/machinery/light/no_nightshift{
dir = 8
},
/obj/item/weapon/gun/projectile/automatic/c20r,
/obj/item/ammo_magazine/m10mm,
/obj/item/ammo_magazine/m10mm,
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/armoury_st)
"hV" = (
@@ -2028,7 +2020,7 @@
/turf/simulated/floor/reinforced,
/area/shuttle/manta_ship_boat)
"je" = (
/turf/simulated/wall/rplastihull,
/turf/simulated/wall/rshull,
/area/shuttle/manta_ship_boat)
"jg" = (
/obj/machinery/power/apc/hyper{
@@ -2436,35 +2428,36 @@
/obj/effect/floor_decal/techfloor{
dir = 8
},
/obj/item/weapon/gun/projectile/automatic/c20r,
/obj/item/ammo_magazine/m10mm,
/obj/item/ammo_magazine/m10mm,
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/armoury_st)
"lk" = (
/obj/machinery/atmospherics/pipe/simple/heat_exchanging{
dir = 9
},
/turf/simulated/wall/rplastihull,
/turf/simulated/wall/rshull,
/area/ship/manta/radiator_port)
"lm" = (
/turf/simulated/wall/rplastihull,
/turf/simulated/wall/rshull,
/area/ship/manta/recreation)
"lo" = (
/obj/structure/table/rack,
/obj/item/weapon/gun/projectile/silenced,
/obj/item/weapon/gun/projectile/silenced,
/obj/item/ammo_magazine/m45,
/obj/item/ammo_magazine/m45,
/obj/item/ammo_magazine/m45/ap,
/obj/item/ammo_magazine/m45/hp,
/obj/item/ammo_magazine/m45/rubber,
/obj/effect/floor_decal/techfloor{
dir = 4
},
/obj/item/weapon/gun/projectile/sec/wood,
/obj/item/weapon/gun/projectile/sec/wood,
/obj/structure/table/rack,
/obj/item/weapon/gun/projectile/automatic/sts35,
/obj/item/weapon/gun/projectile/automatic/sts35,
/obj/item/ammo_magazine/m545,
/obj/item/ammo_magazine/m545,
/obj/item/ammo_magazine/m545,
/obj/item/ammo_magazine/m545,
/obj/item/ammo_magazine/m545/ap,
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/armoury_st)
"lq" = (
/turf/simulated/wall/plastihull,
/turf/simulated/wall/shull,
/area/ship/manta/recreation)
"lw" = (
/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
@@ -2768,7 +2761,7 @@
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/bridge)
"mT" = (
/turf/simulated/wall/rplastihull,
/turf/simulated/wall/rshull,
/area/ship/manta/hallways_star)
"mW" = (
/obj/structure/cable{
@@ -2796,7 +2789,7 @@
/obj/machinery/atmospherics/pipe/simple/heat_exchanging{
dir = 10
},
/turf/simulated/wall/rplastihull,
/turf/simulated/wall/rshull,
/area/ship/manta/radiator_port)
"na" = (
/obj/structure/catwalk,
@@ -2887,7 +2880,7 @@
/obj/machinery/atmospherics/pipe/simple/heat_exchanging{
dir = 6
},
/turf/simulated/wall/rplastihull,
/turf/simulated/wall/rshull,
/area/ship/manta/radiator_star)
"nu" = (
/obj/structure/cable{
@@ -3056,7 +3049,7 @@
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/bridge)
"oc" = (
/turf/simulated/wall/rplastihull,
/turf/simulated/wall/rshull,
/area/ship/manta/mech_bay)
"oe" = (
/obj/machinery/atmospherics/unary/vent_pump/on{
@@ -3123,7 +3116,7 @@
/obj/machinery/atmospherics/pipe/simple/heat_exchanging{
dir = 4
},
/turf/simulated/wall/rplastihull,
/turf/simulated/wall/rshull,
/area/ship/manta/radiator_port)
"ot" = (
/obj/structure/catwalk,
@@ -3296,7 +3289,7 @@
/obj/machinery/atmospherics/pipe/simple/heat_exchanging{
dir = 4
},
/turf/simulated/wall/rplastihull,
/turf/simulated/wall/rshull,
/area/ship/manta/radiator_star)
"oY" = (
/obj/machinery/scale,
@@ -3340,7 +3333,7 @@
/turf/simulated/floor/plating,
/area/ship/manta/radiator_port)
"py" = (
/turf/simulated/wall/plastihull,
/turf/simulated/wall/shull,
/area/ship/manta/barracks/bed_2)
"pA" = (
/obj/structure/bed/chair/bay/shuttle{
@@ -3359,7 +3352,7 @@
/obj/machinery/atmospherics/pipe/simple/visible{
dir = 5
},
/turf/simulated/wall/rplastihull,
/turf/simulated/wall/rshull,
/area/ship/manta/radiator_port)
"pD" = (
/obj/machinery/atmospherics/pipe/simple/visible{
@@ -3460,7 +3453,7 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/fuel{
dir = 4
},
/turf/simulated/wall/rplastihull,
/turf/simulated/wall/rshull,
/area/shuttle/manta_ship_boat)
"qg" = (
/obj/machinery/atmospherics/unary/engine{
@@ -3558,7 +3551,7 @@
/obj/machinery/atmospherics/pipe/simple/visible{
dir = 9
},
/turf/simulated/wall/rplastihull,
/turf/simulated/wall/rshull,
/area/ship/manta/radiator_star)
"qH" = (
/obj/machinery/alarm/alarms_hidden{
@@ -3614,7 +3607,7 @@
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/hallways_aft)
"qQ" = (
/turf/simulated/wall/rplastihull,
/turf/simulated/wall/rshull,
/area/ship/manta/radiator_star)
"qR" = (
/obj/machinery/bodyscanner{
@@ -3718,7 +3711,7 @@
/turf/simulated/floor/plating,
/area/ship/manta/radiator_port)
"rA" = (
/turf/simulated/wall/plastihull,
/turf/simulated/wall/shull,
/area/ship/manta/radiator_port)
"rC" = (
/obj/structure/cable/orange{
@@ -3771,7 +3764,7 @@
/turf/simulated/floor/plating,
/area/ship/manta/atmos)
"rJ" = (
/turf/simulated/wall/plastihull,
/turf/simulated/wall/shull,
/area/ship/manta/dock_star)
"rK" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -3781,7 +3774,7 @@
/turf/simulated/floor/plating,
/area/ship/manta/atmos)
"rM" = (
/turf/simulated/wall/plastihull,
/turf/simulated/wall/shull,
/area/ship/manta/med)
"rQ" = (
/obj/structure/bed/chair/bay/comfy/red,
@@ -3888,7 +3881,7 @@
/obj/machinery/atmospherics/pipe/simple/heat_exchanging{
dir = 5
},
/turf/simulated/wall/rplastihull,
/turf/simulated/wall/rshull,
/area/ship/manta/radiator_star)
"su" = (
/obj/structure/bed/chair/comfy/black{
@@ -3950,7 +3943,7 @@
/turf/simulated/floor/plating,
/area/ship/manta/radiator_port)
"sN" = (
/turf/simulated/wall/plastihull,
/turf/simulated/wall/shull,
/area/ship/manta/bridge)
"sS" = (
/obj/structure/cable/orange{
@@ -3980,7 +3973,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden{
dir = 4
},
/turf/simulated/wall/plastihull,
/turf/simulated/wall/shull,
/area/ship/manta/engineering)
"sY" = (
/obj/effect/floor_decal/techfloor{
@@ -4061,6 +4054,10 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/hallways_port)
"tv" = (
/obj/item/ammo_magazine/m762m/ap,
/turf/simulated/wall/rshull,
/area/ship/manta/armoury_st)
"tx" = (
/obj/effect/floor_decal/techfloor{
dir = 1
@@ -4210,13 +4207,6 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/shuttle/manta_ship_boat)
"ui" = (
/obj/item/device/perfect_tele_beacon/stationary{
tele_name = "Mercenary Boarding Craft";
tele_network = "syndicate"
},
/turf/simulated/floor/tiled/techfloor,
/area/shuttle/manta_ship_boat)
"uk" = (
/obj/machinery/door/firedoor/border_only,
/obj/structure/grille,
@@ -4278,7 +4268,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden{
dir = 4
},
/turf/simulated/wall/plastihull,
/turf/simulated/wall/shull,
/area/ship/manta/radiator_port)
"uC" = (
/obj/effect/floor_decal/industrial/warning/corner{
@@ -4946,7 +4936,7 @@
/area/ship/manta/engineering)
"xc" = (
/obj/structure/sign/nosmoking_1,
/turf/simulated/wall/plastihull,
/turf/simulated/wall/shull,
/area/ship/manta/engine)
"xd" = (
/obj/machinery/atmospherics/pipe/tank/air{
@@ -5561,7 +5551,7 @@
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/hallways_port)
"zl" = (
/turf/simulated/wall/rplastihull,
/turf/simulated/wall/rshull,
/area/ship/manta/armoury_as)
"zm" = (
/obj/machinery/door/airlock/vault{
@@ -5613,9 +5603,6 @@
"zv" = (
/obj/structure/table/rack,
/obj/item/weapon/gun/energy/plasmastun,
/obj/item/weapon/gun/energy/plasmastun,
/obj/item/weapon/gun/energy/plasmastun,
/obj/item/weapon/gun/energy/plasmastun,
/obj/effect/floor_decal/techfloor{
dir = 8
},
@@ -5627,6 +5614,9 @@
/obj/item/weapon/cell/device/weapon,
/obj/item/weapon/cell/device/weapon,
/obj/item/weapon/cell/device/weapon,
/obj/item/weapon/gun/energy/netgun,
/obj/item/weapon/gun/energy/netgun,
/obj/item/weapon/gun/energy/plasmastun,
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/armoury_st)
"zx" = (
@@ -5685,7 +5675,7 @@
/area/ship/manta/armoury_st)
"zE" = (
/obj/machinery/atmospherics/pipe/simple/visible,
/turf/simulated/wall/rplastihull,
/turf/simulated/wall/rshull,
/area/ship/manta/radiator_port)
"zH" = (
/obj/structure/table/rack,
@@ -5722,7 +5712,7 @@
/turf/simulated/floor/plating,
/area/ship/manta/engine)
"zR" = (
/turf/simulated/wall/plastihull,
/turf/simulated/wall/shull,
/area/ship/manta/engineering)
"zS" = (
/obj/structure/bed/chair/comfy/black{
@@ -5980,7 +5970,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden{
dir = 4
},
/turf/simulated/wall/plastihull,
/turf/simulated/wall/shull,
/area/ship/manta/atmos)
"Bw" = (
/obj/effect/floor_decal/techfloor{
@@ -6309,7 +6299,7 @@
/obj/machinery/atmospherics/pipe/simple/visible{
dir = 5
},
/turf/simulated/wall/rplastihull,
/turf/simulated/wall/rshull,
/area/ship/manta/dock_port)
"Dg" = (
/obj/structure/table/rack,
@@ -6407,10 +6397,6 @@
/area/ship/manta/radiator_star)
"Du" = (
/obj/structure/table/rack,
/obj/item/weapon/gun/energy/netgun,
/obj/item/weapon/gun/energy/netgun,
/obj/item/weapon/gun/energy/netgun,
/obj/item/weapon/gun/energy/netgun,
/obj/effect/floor_decal/techfloor{
dir = 8
},
@@ -6525,7 +6511,7 @@
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/hallways_star)
"DY" = (
/turf/simulated/wall/plastihull,
/turf/simulated/wall/shull,
/area/ship/manta/teleporter)
"DZ" = (
/obj/structure/flora/pottedplant/large,
@@ -6555,7 +6541,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
dir = 6
},
/turf/simulated/wall/rplastihull,
/turf/simulated/wall/rshull,
/area/shuttle/manta_ship_boat)
"Eh" = (
/obj/effect/floor_decal/techfloor,
@@ -6638,7 +6624,7 @@
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/hallways_aft)
"EA" = (
/turf/simulated/wall/rplastihull,
/turf/simulated/wall/rshull,
/area/ship/manta/hallways_aft)
"EE" = (
/obj/structure/table/rack,
@@ -7033,7 +7019,7 @@
/obj/machinery/atmospherics/pipe/simple/visible{
dir = 9
},
/turf/simulated/wall/rplastihull,
/turf/simulated/wall/rshull,
/area/ship/manta/dock_star)
"Ha" = (
/obj/machinery/door/airlock/external,
@@ -7311,7 +7297,7 @@
/area/ship/manta/bridge)
"IE" = (
/obj/machinery/atmospherics/pipe/manifold/visible,
/turf/simulated/wall/rplastihull,
/turf/simulated/wall/rshull,
/area/ship/manta/dock_port)
"IF" = (
/obj/machinery/computer/ship/engines{
@@ -7396,7 +7382,7 @@
/turf/simulated/floor/wood,
/area/ship/manta/barracks)
"IV" = (
/turf/simulated/wall/rplastihull,
/turf/simulated/wall/rshull,
/area/ship/manta/commander)
"Jb" = (
/obj/structure/table/rack,
@@ -7620,9 +7606,6 @@
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/bridge)
"Kd" = (
/mob/living/simple_mob/animal/passive/fox/syndicate{
name = "Rick"
},
/obj/structure/dogbed,
/obj/machinery/alarm/alarms_hidden{
pixel_y = 26
@@ -7630,6 +7613,9 @@
/obj/machinery/light/no_nightshift{
dir = 1
},
/mob/living/simple_mob/animal/passive/fox/syndicate{
name = "Rick"
},
/turf/simulated/floor/wood,
/area/ship/manta/commander)
"Ki" = (
@@ -7713,7 +7699,7 @@
/obj/machinery/atmospherics/pipe/simple/visible{
dir = 6
},
/turf/simulated/wall/plastihull,
/turf/simulated/wall/shull,
/area/ship/manta/dock_star)
"KA" = (
/obj/structure/table/rack/shelf/steel,
@@ -7769,7 +7755,7 @@
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/dock_port)
"KJ" = (
/turf/simulated/wall/rplastihull,
/turf/simulated/wall/rshull,
/area/ship/manta/teleporter)
"KL" = (
/obj/effect/floor_decal/techfloor{
@@ -7882,7 +7868,7 @@
/area/ship/manta/bridge)
"Lm" = (
/obj/machinery/atmospherics/pipe/manifold/visible,
/turf/simulated/wall/rplastihull,
/turf/simulated/wall/rshull,
/area/ship/manta/dock_star)
"Lp" = (
/obj/effect/floor_decal/industrial/warning/corner{
@@ -8017,7 +8003,7 @@
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/dock_star)
"LZ" = (
/turf/simulated/wall/plastihull,
/turf/simulated/wall/shull,
/area/ship/manta/hallways_star)
"Mb" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -8052,7 +8038,7 @@
/area/ship/manta/hallways_aft)
"Mg" = (
/obj/structure/sign/nosmoking_1,
/turf/simulated/wall/plastihull,
/turf/simulated/wall/shull,
/area/ship/manta/engineering)
"Mh" = (
/obj/machinery/atmospherics/pipe/simple/hidden{
@@ -8379,7 +8365,7 @@
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/engineering)
"NQ" = (
/turf/simulated/wall/plastihull,
/turf/simulated/wall/shull,
/area/ship/manta/barracks)
"NT" = (
/obj/effect/floor_decal/techfloor/corner{
@@ -8440,7 +8426,7 @@
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/armoury_st)
"Oq" = (
/turf/simulated/wall/rplastihull,
/turf/simulated/wall/rshull,
/area/ship/manta/radiator_port)
"Or" = (
/obj/machinery/chemical_dispenser/bar_coffee/full{
@@ -8453,22 +8439,7 @@
/turf/simulated/floor/wood,
/area/ship/manta/barracks)
"Ou" = (
/obj/structure/table/rack,
/obj/item/device/camera_film,
/obj/item/device/camera_film,
/obj/item/device/camera_film,
/obj/item/device/camera_film,
/obj/item/device/camera_film,
/obj/item/device/camera_film,
/obj/item/device/camera,
/obj/item/device/camera,
/obj/item/device/camera,
/obj/item/device/camera,
/obj/item/device/camera,
/obj/item/device/camera,
/obj/effect/floor_decal/techfloor{
dir = 8
},
/obj/item/weapon/gun/projectile/automatic/bullpup,
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/armoury_st)
"Ox" = (
@@ -8530,7 +8501,7 @@
/area/ship/manta/holding)
"OO" = (
/obj/structure/sign/warning/radioactive,
/turf/simulated/wall/plastihull,
/turf/simulated/wall/shull,
/area/ship/manta/engineering)
"OP" = (
/obj/machinery/atmospherics/pipe/simple/heat_exchanging{
@@ -8655,7 +8626,7 @@
/turf/simulated/floor/tiled/dark,
/area/ship/manta/holding)
"Pn" = (
/turf/simulated/wall/plastihull,
/turf/simulated/wall/shull,
/area/ship/manta/hangar)
"Py" = (
/obj/machinery/door/blast/shutters{
@@ -8691,7 +8662,7 @@
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/hallways_aft)
"PK" = (
/turf/simulated/wall/rplastihull,
/turf/simulated/wall/rshull,
/area/ship/manta/dock_star)
"PL" = (
/obj/machinery/door/blast/shutters{
@@ -8942,7 +8913,7 @@
/turf/simulated/floor/reinforced/airless,
/area/ship/manta/radiator_star)
"QT" = (
/turf/simulated/wall/plastihull,
/turf/simulated/wall/shull,
/area/ship/manta/radiator_star)
"QU" = (
/obj/effect/floor_decal/industrial/warning{
@@ -9448,6 +9419,9 @@
/obj/effect/floor_decal/techfloor{
dir = 4
},
/obj/item/weapon/plastique,
/obj/item/weapon/plastique,
/obj/item/weapon/plastique,
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/recreation)
"Tn" = (
@@ -9602,7 +9576,7 @@
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/dock_star)
"Ue" = (
/turf/simulated/wall/plastihull,
/turf/simulated/wall/shull,
/area/ship/manta/engine)
"Ug" = (
/obj/machinery/vending/wallmed1/public{
@@ -9795,7 +9769,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
dir = 10
},
/turf/simulated/wall/rplastihull,
/turf/simulated/wall/rshull,
/area/shuttle/manta_ship_boat)
"Va" = (
/obj/machinery/atmospherics/pipe/tank/phoron,
@@ -9839,25 +9813,33 @@
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/armoury_as)
"Vp" = (
/turf/simulated/wall/rplastihull,
/turf/simulated/wall/rshull,
/area/ship/manta/hangar)
"Vr" = (
/obj/structure/table/rack,
/obj/item/ammo_magazine/m545,
/obj/item/ammo_magazine/m545,
/obj/item/ammo_magazine/m545,
/obj/item/ammo_magazine/m545,
/obj/item/ammo_magazine/m545,
/obj/item/ammo_magazine/m545,
/obj/item/ammo_magazine/m545/ap,
/obj/item/ammo_magazine/m545/ap,
/obj/item/ammo_magazine/m545/ap,
/obj/item/ammo_magazine/m545/ap,
/obj/item/weapon/gun/projectile/automatic/sts35,
/obj/item/weapon/gun/projectile/automatic/sts35,
/obj/effect/floor_decal/techfloor{
dir = 4
},
/obj/item/weapon/gun/projectile/automatic/bullpup,
/obj/item/weapon/gun/projectile/automatic/bullpup,
/obj/item/weapon/gun/projectile/automatic/bullpup,
/obj/item/weapon/gun/projectile/automatic/bullpup,
/obj/item/ammo_magazine/m762m,
/obj/item/ammo_magazine/m762m,
/obj/item/ammo_magazine/m762m,
/obj/item/ammo_magazine/m762m,
/obj/item/ammo_magazine/m762m,
/obj/item/ammo_magazine/m762m,
/obj/item/ammo_magazine/m762m,
/obj/item/ammo_magazine/m762m,
/obj/item/ammo_magazine/m762m/ap,
/obj/item/ammo_magazine/m762m/ap,
/obj/item/ammo_magazine/m762m/ap,
/obj/item/ammo_magazine/m762m/ap,
/obj/item/ammo_magazine/m762m,
/obj/item/ammo_magazine/m762m,
/obj/item/ammo_magazine/m762m,
/obj/item/ammo_magazine/m762m,
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/armoury_as)
"Vx" = (
@@ -9942,7 +9924,7 @@
/obj/machinery/atmospherics/pipe/simple/hidden{
dir = 4
},
/turf/simulated/wall/plastihull,
/turf/simulated/wall/shull,
/area/ship/manta/radiator_star)
"VL" = (
/obj/structure/table/rack,
@@ -10080,7 +10062,7 @@
/turf/simulated/floor/wood,
/area/ship/manta/barracks)
"WF" = (
/turf/simulated/wall/rplastihull,
/turf/simulated/wall/rshull,
/area/ship/manta/dock_port)
"WN" = (
/obj/machinery/door/firedoor/multi_tile,
@@ -10240,7 +10222,7 @@
/obj/machinery/atmospherics/pipe/simple/visible{
dir = 10
},
/turf/simulated/wall/plastihull,
/turf/simulated/wall/shull,
/area/ship/manta/dock_port)
"Xx" = (
/obj/machinery/atmospherics/pipe/simple/hidden/fuel{
@@ -10316,7 +10298,7 @@
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/barracks)
"XE" = (
/turf/simulated/wall/rplastihull,
/turf/simulated/wall/rshull,
/area/ship/manta/engine)
"XF" = (
/obj/structure/cable/orange{
@@ -10669,7 +10651,7 @@
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/teleporter)
"Zr" = (
/turf/simulated/wall/plastihull,
/turf/simulated/wall/shull,
/area/ship/manta/hallways_aft)
"Zv" = (
/obj/machinery/door/firedoor,
@@ -10688,7 +10670,7 @@
/turf/simulated/floor/tiled/dark,
/area/ship/manta/holding)
"Zy" = (
/turf/simulated/wall/plastihull,
/turf/simulated/wall/shull,
/area/ship/manta/dock_port)
"Zz" = (
/obj/machinery/atmospherics/pipe/manifold/visible/black{
@@ -10778,7 +10760,7 @@
/turf/simulated/floor/tiled/techfloor,
/area/ship/manta/recreation)
"ZQ" = (
/turf/simulated/wall/rplastihull,
/turf/simulated/wall/rshull,
/area/ship/manta/bridge)
"ZS" = (
/obj/structure/catwalk,
@@ -10788,10 +10770,10 @@
/turf/simulated/floor/plating,
/area/ship/manta/radiator_port)
"ZT" = (
/turf/simulated/wall/rplastihull,
/turf/simulated/wall/rshull,
/area/ship/manta/armoury_st)
"ZU" = (
/turf/simulated/wall/plastihull,
/turf/simulated/wall/shull,
/area/ship/manta/atmos)
"ZV" = (
/obj/structure/table/woodentable,
@@ -16633,10 +16615,10 @@ yz
yz
yz
yz
bg
bg
bg
bg
yz
yz
yz
yz
yz
yz
yz
@@ -16910,10 +16892,6 @@ yz
yz
yz
yz
bg
bg
bg
bg
yz
yz
yz
@@ -16924,10 +16902,14 @@ yz
yz
yz
yz
bg
bg
bg
bg
yz
yz
yz
yz
yz
yz
yz
yz
yz
yz
yz
@@ -18560,7 +18542,7 @@ ZT
ZT
ZT
ZT
ZT
tv
ZT
ZT
ZT
@@ -19703,7 +19685,7 @@ bR
HS
DY
RO
fh
Fd
QU
uc
KJ
@@ -20824,7 +20806,7 @@ jE
lZ
pH
pH
ui
pH
pH
AD
En
maps/tether/tether-01-surface1.dmm
+1300 -319
View File
File diff suppressed because it is too large Load Diff
maps/tether/tether-02-surface2.dmm
+89 -22
View File
@@ -34431,6 +34431,22 @@
/obj/machinery/vending/snack,
/turf/simulated/floor/tiled/white,
/area/tether/surfacebase/medical/breakroom)
"etU" = (
/obj/machinery/door/airlock/maintenance_hatch{
req_one_access = list(746)
},
/turf/simulated/floor/plating,
/area/tether/surfacebase/funny/hideyhole)
"eKn" = (
/turf/simulated/floor/plating,
/area/tether/surfacebase/funny/hideyhole)
"frf" = (
/obj/item/weapon/paper{
info = "I finally got them. The last pair of Shitty Tim's Shitty Timbs. I waited in line at the cargo shop for what seemed like hours. It probably was hours quite frankly. Well after I got my box, someone ran by and jacked my heels! Well I needed shoes so I snuck inside and stole what they had left. Just a pair of NT worshoes. But atleast I'm not walking away barefooted. If only I wasn't caught by a security. I feel like I've been in this hole for days. Good thing I managed to pilfer some provisions on the way here.";
name = "Pilferer's note"
},
/turf/simulated/floor/plating,
/area/tether/surfacebase/funny/hideyhole)
"fxr" = (
/obj/machinery/light{
dir = 8
@@ -34442,6 +34458,23 @@
/obj/structure/table/glass,
/turf/simulated/floor/tiled/white,
/area/tether/surfacebase/medical/breakroom)
"gwn" = (
/obj/item/trash/snack_bowl,
/obj/item/trash/sosjerky,
/obj/item/trash/sosjerky,
/obj/item/trash/sosjerky,
/obj/item/trash/unajerky,
/obj/item/trash/waffles,
/obj/structure/closet/crate/trashcart,
/obj/item/trash/cheesie,
/obj/item/trash/cheesie,
/turf/simulated/floor/plating,
/area/tether/surfacebase/funny/hideyhole)
"jCz" = (
/turf/simulated/wall{
can_open = 1
},
/area/tether/surfacebase/public_garden_two)
"kPb" = (
/obj/structure/cable{
icon_state = "4-8"
@@ -34513,6 +34546,10 @@
},
/turf/simulated/floor/tiled/techmaint,
/area/tether/surfacebase/surface_two_hall)
"mCl" = (
/obj/machinery/floodlight,
/turf/simulated/floor/plating,
/area/tether/surfacebase/funny/hideyhole)
"mUP" = (
/obj/structure/bed/padded,
/obj/effect/floor_decal/techfloor,
@@ -34539,6 +34576,13 @@
/obj/item/weapon/deck/cah,
/turf/simulated/floor/tiled/white,
/area/tether/surfacebase/medical/breakroom)
"olc" = (
/obj/item/weapon/grenade/chem_grenade/cleaner{
pixel_x = -10
},
/obj/item/weapon/grenade/anti_photon,
/turf/simulated/floor/plating,
/area/tether/surfacebase/funny/hideyhole)
"pah" = (
/obj/machinery/door/firedoor/glass,
/obj/machinery/door/airlock{
@@ -34591,6 +34635,15 @@
},
/turf/simulated/floor/tiled/white,
/area/tether/surfacebase/medical/breakroom)
"shd" = (
/obj/item/weapon/storage/rollingpapers,
/obj/item/clothing/mask/smokable/cigarette/joint,
/obj/item/clothing/mask/smokable/cigarette/joint,
/obj/item/clothing/mask/smokable/cigarette/cigar/cohiba,
/obj/item/clothing/mask/smokable/cigarette/cigar/cohiba,
/obj/item/weapon/flame/lighter/zippo/moff,
/turf/simulated/floor/plating,
/area/tether/surfacebase/funny/hideyhole)
"sVf" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -34652,6 +34705,13 @@
"tPB" = (
/turf/simulated/floor/grass,
/area/chapel/main)
"uay" = (
/obj/item/clothing/shoes/syndigaloshes{
desc = "A pair of Nanotrasen Saf-T-Stride brown, nonslip, shoes.";
name = "NT nonslips"
},
/turf/simulated/floor/plating,
/area/tether/surfacebase/funny/hideyhole)
"unM" = (
/obj/effect/floor_decal/corner/paleblue/diagonal,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -34659,6 +34719,13 @@
/obj/structure/table/glass,
/turf/simulated/floor/tiled/white,
/area/tether/surfacebase/medical/breakroom)
"uHy" = (
/obj/structure/bed/chair{
dir = 4
},
/obj/effect/decal/remains/human,
/turf/simulated/floor/plating,
/area/tether/surfacebase/funny/hideyhole)
"uKv" = (
/obj/effect/floor_decal/corner/paleblue/diagonal,
/obj/machinery/light{
@@ -39049,9 +39116,9 @@ adt
adt
adt
adt
adt
adt
adt
frf
shd
uHy
adt
adt
adt
@@ -39191,9 +39258,9 @@ adt
adt
adt
adt
adt
adt
adt
olc
eKn
eKn
adt
adt
adt
@@ -39329,12 +39396,12 @@ adt
adt
adt
adt
adt
adt
adt
adt
adt
adt
eKn
eKn
etU
etU
eKn
uay
adt
adt
adt
@@ -39470,13 +39537,13 @@ adt
adt
adt
adt
eKn
eKn
adt
adt
adt
adt
adt
adt
adt
gwn
mCl
adt
adt
adt
@@ -39607,12 +39674,12 @@ apn
anf
aro
asr
akX
akX
adt
adt
adt
adt
jCz
jCz
eKn
eKn
eKn
eKn
adt
adt
adt
maps/tether/tether_areas.dm
+16
View File
@@ -495,6 +495,22 @@
name = "\improper Entertainment Stage"
icon_state = "library"
/area/tether/surfacebase/funny/clownoffice
name = "\improper Clown's Office"
icon_state = "library"
/area/tether/surfacebase/funny/mimeoffice
name = "\improper Mime's Office"
icon_state = "library"
/area/tether/surfacebase/funny/tomfoolery
name = "\improper Tomfoolery Closet"
icon_state = "library"
/area/tether/surfacebase/funny/hideyhole
name = "\improper Pilferer's Hole"
icon_state = "library"
/area/tether/surfacebase/entertainment/backstage
name = "\improper Entertainment Backstage"
icon_state = "library"
vorestation.dme
+3 -1
View File
@@ -2123,6 +2123,7 @@
#include "code\modules\food\recipe.dm"
#include "code\modules\food\recipe_dump.dm"
#include "code\modules\food\recipes_fryer.dm"
#include "code\modules\food\recipes_fryer_vr.dm"
#include "code\modules\food\recipes_grill.dm"
#include "code\modules\food\recipes_microwave.dm"
#include "code\modules\food\recipes_microwave_vr.dm"
@@ -2271,13 +2272,13 @@
#include "code\modules\hydroponics\seedtypes\nettles.dm"
#include "code\modules\hydroponics\seedtypes\onion.dm"
#include "code\modules\hydroponics\seedtypes\peanuts.dm"
#include "code\modules\hydroponics\seedtypes\pineapple.dm"
#include "code\modules\hydroponics\seedtypes\potato.dm"
#include "code\modules\hydroponics\seedtypes\pumpkin.dm"
#include "code\modules\hydroponics\seedtypes\rhubarb.dm"
#include "code\modules\hydroponics\seedtypes\rice.dm"
#include "code\modules\hydroponics\seedtypes\selemhand.dm"
#include "code\modules\hydroponics\seedtypes\soybean.dm"
#include "code\modules\hydroponics\seedtypes\spineapple.dm"
#include "code\modules\hydroponics\seedtypes\sugarcane.dm"
#include "code\modules\hydroponics\seedtypes\surik.dm"
#include "code\modules\hydroponics\seedtypes\telriis.dm"
@@ -2882,6 +2883,7 @@
#include "code\modules\mob\living\simple_mob\subtypes\slime\xenobio\subtypes_vr.dm"
#include "code\modules\mob\living\simple_mob\subtypes\slime\xenobio\xenobio.dm"
#include "code\modules\mob\living\simple_mob\subtypes\vore\bee.dm"
#include "code\modules\mob\living\simple_mob\subtypes\vore\c_pet.dm"
#include "code\modules\mob\living\simple_mob\subtypes\vore\catgirl.dm"
#include "code\modules\mob\living\simple_mob\subtypes\vore\cookiegirl.dm"
#include "code\modules\mob\living\simple_mob\subtypes\vore\corrupt_hounds.dm"