diff --git a/code/__defines/species_languages_vr.dm b/code/__defines/species_languages_vr.dm
index 8909238db2d..78054e6ba86 100644
--- a/code/__defines/species_languages_vr.dm
+++ b/code/__defines/species_languages_vr.dm
@@ -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"
diff --git a/code/datums/uplink/tools_vr.dm b/code/datums/uplink/tools_vr.dm
index 871bfbb5add..ad68f769229 100644
--- a/code/datums/uplink/tools_vr.dm
+++ b/code/datums/uplink/tools_vr.dm
@@ -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
diff --git a/code/game/jobs/access_datum_vr.dm b/code/game/jobs/access_datum_vr.dm
index 16038248d01..bd3906f16c5 100644
--- a/code/game/jobs/access_datum_vr.dm
+++ b/code/game/jobs/access_datum_vr.dm
@@ -27,4 +27,22 @@ var/const/access_pilot = 67
/datum/access/entertainment
id = access_entertainment
desc = "Entertainment Backstage"
- region = ACCESS_REGION_GENERAL
\ No newline at end of file
+ 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
diff --git a/code/game/jobs/job/captain_vr.dm b/code/game/jobs/job/captain_vr.dm
index d2b830ad7ba..4062775846d 100644
--- a/code/game/jobs/job/captain_vr.dm
+++ b/code/game/jobs/job/captain_vr.dm
@@ -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"
diff --git a/code/game/jobs/job/special_vr.dm b/code/game/jobs/job/special_vr.dm
index dcb6a51521a..34cc2321ce8 100644
--- a/code/game/jobs/job/special_vr.dm
+++ b/code/game/jobs/job/special_vr.dm
@@ -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)
diff --git a/code/game/machinery/vending_machines_vr.dm b/code/game/machinery/vending_machines_vr.dm
index fd113ee799b..c4c4e663d4b 100644
--- a/code/game/machinery/vending_machines_vr.dm
+++ b/code/game/machinery/vending_machines_vr.dm
@@ -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,
diff --git a/code/modules/client/preference_setup/vore/07_traits.dm b/code/modules/client/preference_setup/vore/07_traits.dm
index ecaaa840cf6..71a40519d12 100644
--- a/code/modules/client/preference_setup/vore/07_traits.dm
+++ b/code/modules/client/preference_setup/vore/07_traits.dm
@@ -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
diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm
index 3d6c80eedd4..0c32155812c 100644
--- a/code/modules/client/preferences.dm
+++ b/code/modules/client/preferences.dm
@@ -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
diff --git a/code/modules/clothing/under/jobs/medsci.dm b/code/modules/clothing/under/jobs/medsci.dm
index 744c2a55c21..f77ec96a541 100644
--- a/code/modules/clothing/under/jobs/medsci.dm
+++ b/code/modules/clothing/under/jobs/medsci.dm
@@ -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."
diff --git a/code/modules/clothing/under/miscellaneous.dm b/code/modules/clothing/under/miscellaneous.dm
index fdc73151b0c..c9a6bfa30f2 100644
--- a/code/modules/clothing/under/miscellaneous.dm
+++ b/code/modules/clothing/under/miscellaneous.dm
@@ -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"
diff --git a/code/modules/food/food/snacks.dm b/code/modules/food/food/snacks.dm
index cbe9ff8f77b..b526f65050c 100644
--- a/code/modules/food/food/snacks.dm
+++ b/code/modules/food/food/snacks.dm
@@ -1754,20 +1754,6 @@
. = ..()
bitesize = 2
-/obj/item/weapon/reagent_containers/food/snacks/mashedpotato
- name = "Mashed Potato"
- desc = "Pillowy mounds of mashed potato."
- icon_state = "mashedpotato"
- trash = /obj/item/trash/plate
- filling_color = "#EDDD00"
- center_of_mass = list("x"=16, "y"=11)
- nutriment_amt = 4
- nutriment_desc = list("fluffy mashed potatoes" = 4)
-
-/obj/item/weapon/reagent_containers/food/snacks/mashedpotato/Initialize()
- . = ..()
- bitesize = 2
-
/obj/item/weapon/reagent_containers/food/snacks/bangersandmash
name = "Bangers and Mash"
desc = "An English treat."
@@ -1886,13 +1872,13 @@
trash = /obj/item/trash/plate
filling_color = "#7A3D11"
center_of_mass = list("x"=16, "y"=13)
+ bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/meatsteak/Initialize()
. = ..()
reagents.add_reagent("protein", 4)
reagents.add_reagent("sodiumchloride", 1)
reagents.add_reagent("blackpepper", 1)
- bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/spacylibertyduff
name = "Spacy Liberty Duff"
@@ -1903,11 +1889,11 @@
center_of_mass = list("x"=16, "y"=8)
nutriment_amt = 6
nutriment_desc = list("mushroom" = 6)
+ bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/spacylibertyduff/Initialize()
. = ..()
reagents.add_reagent("psilocybin", 6)
- bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/amanitajelly
name = "Amanita Jelly"
@@ -1918,12 +1904,12 @@
center_of_mass = list("x"=16, "y"=5)
nutriment_amt = 6
nutriment_desc = list("jelly" = 3, "mushroom" = 3)
+ bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/amanitajelly/Initialize()
. = ..()
reagents.add_reagent("amatoxin", 6)
reagents.add_reagent("psilocybin", 3)
- bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/poppypretzel
name = "Poppy pretzel"
@@ -1946,24 +1932,24 @@
trash = /obj/item/trash/snack_bowl
filling_color = "#785210"
center_of_mass = list("x"=16, "y"=8)
+ bitesize = 5
/obj/item/weapon/reagent_containers/food/snacks/meatballsoup/Initialize()
. = ..()
reagents.add_reagent("protein", 8)
reagents.add_reagent("water", 5)
- bitesize = 5
/obj/item/weapon/reagent_containers/food/snacks/slimesoup
name = "slime soup"
desc = "If no water is available, you may substitute tears."
icon_state = "slimesoup" //nonexistant? - 3/1/2020 FIXED. roro's live on. - 7/14/2020 - The fuck are you smoking, roro's is stupid, name it slimesoup so it's clear wtf it is.
filling_color = "#C4DBA0"
+ bitesize = 5
/obj/item/weapon/reagent_containers/food/snacks/slimesoup/Initialize()
. = ..()
reagents.add_reagent("slimejelly", 5)
reagents.add_reagent("water", 10)
- bitesize = 5
/obj/item/weapon/reagent_containers/food/snacks/bloodsoup
name = "Tomato soup"
@@ -1971,13 +1957,13 @@
icon_state = "tomatosoup"
filling_color = "#FF0000"
center_of_mass = list("x"=16, "y"=7)
+ bitesize = 5
/obj/item/weapon/reagent_containers/food/snacks/bloodsoup/Initialize()
. = ..()
reagents.add_reagent("protein", 2)
reagents.add_reagent("blood", 10)
reagents.add_reagent("water", 5)
- bitesize = 5
/obj/item/weapon/reagent_containers/food/snacks/clownstears
name = "Clown's Tears"
@@ -1987,12 +1973,12 @@
center_of_mass = list("x"=16, "y"=7)
nutriment_amt = 4
nutriment_desc = list("salt" = 1, "the worst joke" = 3)
+ bitesize = 5
/obj/item/weapon/reagent_containers/food/snacks/clownstears/Initialize()
. = ..()
reagents.add_reagent("banana", 5)
reagents.add_reagent("water", 10)
- bitesize = 5
/obj/item/weapon/reagent_containers/food/snacks/vegetablesoup
name = "Vegetable soup"
@@ -2003,11 +1989,11 @@
center_of_mass = list("x"=16, "y"=8)
nutriment_amt = 8
nutriment_desc = list("carrot" = 2, "corn" = 2, "eggplant" = 2, "potato" = 2)
+ bitesize = 5
/obj/item/weapon/reagent_containers/food/snacks/vegetablesoup/Initialize()
. = ..()
reagents.add_reagent("water", 5)
- bitesize = 5
/obj/item/weapon/reagent_containers/food/snacks/nettlesoup
name = "Nettle soup"
@@ -2018,12 +2004,12 @@
center_of_mass = list("x"=16, "y"=7)
nutriment_amt = 8
nutriment_desc = list("salad" = 4, "egg" = 2, "potato" = 2)
+ bitesize = 5
/obj/item/weapon/reagent_containers/food/snacks/nettlesoup/Initialize()
. = ..()
reagents.add_reagent("water", 5)
reagents.add_reagent("tricordrazine", 5)
- bitesize = 5
/obj/item/weapon/reagent_containers/food/snacks/mysterysoup
name = "Mystery soup"
@@ -2034,6 +2020,7 @@
center_of_mass = list("x"=16, "y"=6)
nutriment_amt = 1
nutriment_desc = list("backwash" = 1)
+ bitesize = 5
/obj/item/weapon/reagent_containers/food/snacks/mysterysoup/Initialize()
. = ..()
@@ -2073,7 +2060,6 @@
reagents.add_reagent("nutriment", 6)
reagents.add_reagent("tomatojuice", 5)
reagents.add_reagent("imidazoline", 5)
- bitesize = 5
/obj/item/weapon/reagent_containers/food/snacks/wishsoup
name = "Wish Soup"
@@ -2082,11 +2068,11 @@
trash = /obj/item/trash/snack_bowl
filling_color = "#D1F4FF"
center_of_mass = list("x"=16, "y"=11)
+ bitesize = 5
/obj/item/weapon/reagent_containers/food/snacks/wishsoup/Initialize()
. = ..()
reagents.add_reagent("water", 10)
- bitesize = 5
if(prob(25))
src.desc = "A wish come true!"
reagents.add_reagent("nutriment", 8, list("something good" = 8))
@@ -2100,13 +2086,13 @@
center_of_mass = list("x"=15, "y"=9)
nutriment_amt = 3
nutriment_desc = list("chilli peppers" = 3)
+ bitesize = 5
/obj/item/weapon/reagent_containers/food/snacks/hotchili/Initialize()
. = ..()
reagents.add_reagent("protein", 3)
reagents.add_reagent("capsaicin", 3)
reagents.add_reagent("tomatojuice", 2)
- bitesize = 5
/obj/item/weapon/reagent_containers/food/snacks/coldchili
name = "Cold Chili"
@@ -2117,13 +2103,13 @@
trash = /obj/item/trash/snack_bowl
nutriment_amt = 3
nutriment_desc = list("ice peppers" = 3)
+ bitesize = 5
/obj/item/weapon/reagent_containers/food/snacks/coldchili/Initialize()
. = ..()
reagents.add_reagent("protein", 3)
reagents.add_reagent("frostoil", 3)
reagents.add_reagent("tomatojuice", 2)
- bitesize = 5
/obj/item/weapon/reagent_containers/food/snacks/monkeycube
name = "monkey cube"
@@ -2227,11 +2213,11 @@
center_of_mass = list("x"=16, "y"=11)
nutriment_amt = 4
nutriment_desc = list("buns" = 4)
+ bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/bigbiteburger/Initialize()
. = ..()
reagents.add_reagent("protein", 10)
- bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/enchiladas
name = "Enchiladas"
@@ -2242,12 +2228,12 @@
center_of_mass = list("x"=16, "y"=13)
nutriment_amt = 2
nutriment_desc = list("tortilla" = 3, "corn" = 3)
+ bitesize = 4
/obj/item/weapon/reagent_containers/food/snacks/enchiladas/Initialize()
. = ..()
reagents.add_reagent("protein", 6)
reagents.add_reagent("capsaicin", 6)
- bitesize = 4
/obj/item/weapon/reagent_containers/food/snacks/monkeysdelight
name = "monkey's Delight"
@@ -2256,6 +2242,7 @@
trash = /obj/item/trash/tray
filling_color = "#5C3C11"
center_of_mass = list("x"=16, "y"=13)
+ bitesize = 6
/obj/item/weapon/reagent_containers/food/snacks/monkeysdelight/Initialize()
. = ..()
@@ -2263,7 +2250,6 @@
reagents.add_reagent("banana", 5)
reagents.add_reagent("blackpepper", 1)
reagents.add_reagent("sodiumchloride", 1)
- bitesize = 6
/obj/item/weapon/reagent_containers/food/snacks/baguette
name = "Baguette"
@@ -2273,12 +2259,12 @@
center_of_mass = list("x"=18, "y"=12)
nutriment_amt = 6
nutriment_desc = list("french bread" = 6)
+ bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/baguette/Initialize()
. = ..()
reagents.add_reagent("blackpepper", 1)
reagents.add_reagent("sodiumchloride", 1)
- bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/fishandchips
name = "Fish and Chips"
@@ -2288,11 +2274,11 @@
center_of_mass = list("x"=16, "y"=16)
nutriment_amt = 3
nutriment_desc = list("salt" = 1, "chips" = 3)
+ bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/fishandchips/Initialize()
. = ..()
reagents.add_reagent("protein", 3)
- bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/sandwich
name = "Sandwich"
@@ -2303,11 +2289,11 @@
center_of_mass = list("x"=16, "y"=4)
nutriment_amt = 3
nutriment_desc = list("bread" = 3, "cheese" = 3)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/sandwich/Initialize()
. = ..()
reagents.add_reagent("protein", 3)
- bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/toastedsandwich
name = "Toasted Sandwich"
@@ -2318,12 +2304,12 @@
center_of_mass = list("x"=16, "y"=4)
nutriment_amt = 3
nutriment_desc = list("toasted bread" = 3, "cheese" = 3)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/toastedsandwich/Initialize()
. = ..()
reagents.add_reagent("protein", 3)
reagents.add_reagent("carbon", 2)
- bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/grilledcheese
name = "Grilled Cheese Sandwich"
@@ -2333,11 +2319,11 @@
filling_color = "#D9BE29"
nutriment_amt = 3
nutriment_desc = list("toasted bread" = 3, "cheese" = 3)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/grilledcheese/Initialize()
. = ..()
reagents.add_reagent("protein", 4)
- bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/tomatosoup
name = "Tomato Soup"
@@ -2348,39 +2334,11 @@
center_of_mass = list("x"=16, "y"=7)
nutriment_amt = 5
nutriment_desc = list("soup" = 5)
+ bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/tomatosoup/Initialize()
. = ..()
reagents.add_reagent("tomatojuice", 10)
- bitesize = 3
-
-/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
-
-/obj/item/weapon/reagent_containers/food/snacks/onionrings
- name = "Onion Rings"
- desc = "Crispy rings."
- icon_state = "onionrings"
- trash = /obj/item/trash/plate
- filling_color = "#E0C367"
- center_of_mass = list("x"=16, "y"=7)
- nutriment_amt = 5
- nutriment_desc = list("onion" = 2)
-
-/obj/item/weapon/reagent_containers/food/snacks/onionrings/Initialize()
- . = ..()
- bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/rofflewaffles
name = "Roffle Waffles"
@@ -2391,11 +2349,11 @@
center_of_mass = list("x"=15, "y"=11)
nutriment_amt = 8
nutriment_desc = list("waffle" = 7, "sweetness" = 1)
+ bitesize = 4
/obj/item/weapon/reagent_containers/food/snacks/rofflewaffles/Initialize()
. = ..()
reagents.add_reagent("psilocybin", 8)
- bitesize = 4
/obj/item/weapon/reagent_containers/food/snacks/stew
name = "Stew"
@@ -2407,6 +2365,7 @@
nutriment_desc = list("tomato" = 2, "potato" = 2, "carrot" = 2, "eggplant" = 2, "mushroom" = 2)
drop_sound = 'sound/items/drop/shovel.ogg'
pickup_sound = 'sound/items/pickup/shovel.ogg'
+ bitesize = 10
/obj/item/weapon/reagent_containers/food/snacks/stew/Initialize()
. = ..()
@@ -2414,7 +2373,6 @@
reagents.add_reagent("tomatojuice", 5)
reagents.add_reagent("imidazoline", 5)
reagents.add_reagent("water", 5)
- bitesize = 10
/obj/item/weapon/reagent_containers/food/snacks/jelliedtoast
name = "Jellied Toast"
@@ -2460,18 +2418,18 @@
reagents.add_reagent("cherryjelly", 5)
/obj/item/weapon/reagent_containers/food/snacks/milosoup
- name = "Milosoup"
+ name = "Miso soup"
desc = "The universes best soup! Yum!!!"
icon_state = "milosoup"
trash = /obj/item/trash/snack_bowl
center_of_mass = list("x"=16, "y"=7)
nutriment_amt = 8
nutriment_desc = list("soy" = 8)
+ bitesize = 4
/obj/item/weapon/reagent_containers/food/snacks/milosoup/Initialize()
. = ..()
reagents.add_reagent("water", 5)
- bitesize = 4
/obj/item/weapon/reagent_containers/food/snacks/stewedsoymeat
name = "Stewed Soy Meat"
@@ -2537,11 +2495,11 @@
center_of_mass = list("x"=17, "y"=11)
nutriment_amt = 16
nutriment_desc = list("rice" = 2, "gauze" = 4, "fish" = 10)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/kudzudonburi/Initialize()
. = ..()
reagents.add_reagent("protein", 4)
- bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/pastatomato
name = "Spaghetti"
@@ -2552,11 +2510,11 @@
center_of_mass = list("x"=16, "y"=10)
nutriment_amt = 6
nutriment_desc = list("tomato" = 3, "noodles" = 3)
+ bitesize = 4
/obj/item/weapon/reagent_containers/food/snacks/pastatomato/Initialize()
. = ..()
reagents.add_reagent("tomatojuice", 10)
- bitesize = 4
/obj/item/weapon/reagent_containers/food/snacks/meatballspagetti
name = "Spaghetti & Meatballs"
@@ -2567,11 +2525,11 @@
center_of_mass = list("x"=16, "y"=10)
nutriment_amt = 4
nutriment_desc = list("noodles" = 4)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/meatballspagetti/Initialize()
. = ..()
reagents.add_reagent("protein", 4)
- bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/spesslaw
name = "Spesslaw"
@@ -2581,11 +2539,11 @@
center_of_mass = list("x"=16, "y"=10)
nutriment_amt = 4
nutriment_desc = list("noodles" = 4)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/spesslaw/Initialize()
. = ..()
reagents.add_reagent("protein", 4)
- bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/carrotfries
name = "Carrot Fries"
@@ -2596,11 +2554,11 @@
center_of_mass = list("x"=16, "y"=11)
nutriment_amt = 3
nutriment_desc = list("carrot" = 3, "salt" = 1)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/carrotfries/Initialize()
. = ..()
reagents.add_reagent("imidazoline", 3)
- bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/superbiteburger
name = "Super Bite Burger"
@@ -2610,11 +2568,11 @@
center_of_mass = list("x"=16, "y"=3)
nutriment_amt = 25
nutriment_desc = list("buns" = 25)
+ bitesize = 10
/obj/item/weapon/reagent_containers/food/snacks/superbiteburger/Initialize()
. = ..()
reagents.add_reagent("protein", 25)
- bitesize = 10
/obj/item/weapon/reagent_containers/food/snacks/candiedapple
name = "Candied Apple"
@@ -2703,11 +2661,11 @@
name = "Boiled Slime Core"
desc = "A boiled red thing."
icon_state = "boiledslimecore"
+ bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/boiledslimecore/Initialize()
. = ..()
reagents.add_reagent("slimejelly", 5)
- bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/mint
name = "mint"
@@ -2715,11 +2673,11 @@
icon_state = "mint"
filling_color = "#F2F2F2"
center_of_mass = list("x"=16, "y"=14)
+ bitesize = 1
/obj/item/weapon/reagent_containers/food/snacks/mint/Initialize()
. = ..()
reagents.add_reagent("mint", 1)
- bitesize = 1
/obj/item/weapon/reagent_containers/food/snacks/mint/admints
desc = "Spearmint, peppermint's non-festive cousin."
@@ -2765,6 +2723,7 @@
center_of_mass = list("x"=16, "y"=13)
nutriment_amt = 5
nutriment_desc = list("mushroom" = 4)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/plumphelmetbiscuit/Initialize()
. = ..()
@@ -2772,10 +2731,8 @@
name = "exceptional plump helmet biscuit"
desc = "Microwave is taken by a fey mood! It has cooked an exceptional plump helmet biscuit!"
reagents.add_reagent("nutriment", 8)
- bitesize = 2
else
reagents.add_reagent("nutriment", 5)
- bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/chawanmushi
name = "chawanmushi"
@@ -2784,11 +2741,11 @@
trash = /obj/item/trash/snack_bowl
filling_color = "#F0F2E4"
center_of_mass = list("x"=17, "y"=10)
+ bitesize = 1
/obj/item/weapon/reagent_containers/food/snacks/chawanmushi/Initialize()
. = ..()
reagents.add_reagent("protein", 5)
- bitesize = 1
/obj/item/weapon/reagent_containers/food/snacks/beetsoup
name = "beet soup"
@@ -2799,11 +2756,11 @@
center_of_mass = list("x"=15, "y"=8)
nutriment_amt = 8
nutriment_desc = list("tomato" = 4, "beet" = 4)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/beetsoup/Initialize()
. = ..()
name = pick(list("borsch","bortsch","borstch","borsh","borshch","borscht"))
- bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/tossedsalad
name = "tossed salad"
@@ -2828,11 +2785,11 @@
center_of_mass = list("x"=17, "y"=11)
nutriment_amt = 6
nutriment_desc = list("100% real salad")
+ bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/validsalad/Initialize()
. = ..()
reagents.add_reagent("protein", 2)
- bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/appletart
name = "golden apple streusel tart"
@@ -2843,11 +2800,11 @@
center_of_mass = list("x"=16, "y"=18)
nutriment_amt = 8
nutriment_desc = list("apple" = 8)
+ bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/appletart/Initialize()
. = ..()
reagents.add_reagent("gold", 5)
- bitesize = 3
/////////////////////////////////////////////////Sliceable////////////////////////////////////////
// All the food items that can be sliced into smaller bits like Meatbread and Cheesewheels
@@ -3013,11 +2970,11 @@
center_of_mass = list("x"=16, "y"=10)
nutriment_desc = list("cake" = 10, "sweetness" = 10, "carrot" = 15)
nutriment_amt = 25
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/sliceable/carrotcake/Initialize()
. = ..()
reagents.add_reagent("imidazoline", 10)
- bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/slice/carrotcake
name = "Carrot Cake slice"
@@ -3042,12 +2999,12 @@
center_of_mass = list("x"=16, "y"=10)
nutriment_desc = list("cake" = 10, "sweetness" = 10, "slime" = 15)
nutriment_amt = 5
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/sliceable/braincake/Initialize()
. = ..()
reagents.add_reagent("protein", 25)
reagents.add_reagent("alkysine", 10)
- bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/slice/braincake
name = "Brain Cake slice"
@@ -3459,32 +3416,35 @@
filled = TRUE
/obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/pineapple
- name = "Hawaiian"
- desc = "The accursed wheel from ancient times."
- icon_state = "pizzamargherita"
- slice_path = /obj/item/weapon/reagent_containers/food/snacks/slice/pineapple
+ name = "ham & pineapple pizza"
+ desc = "One of the most debated pizzas in existence."
+ icon = 'icons/obj/food_syn.dmi'
+ icon_state = "pineapple_pizza"
+ slice_path = /obj/item/weapon/reagent_containers/food/snacks/pineappleslice
slices_num = 6
center_of_mass = list("x"=16, "y"=11)
- nutriment_desc = list("pizza crust" = 5, "tomato" = 5, "cheese" = 5, "pineapple" = 20)
- nutriment_amt = 35
+ nutriment_desc = list("pizza crust" = 10, "tomato" = 10, "ham" = 10)
+ nutriment_amt = 30
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/pineapple/Initialize()
. = ..()
- reagents.add_reagent("protein", 5)
- reagents.add_reagent("pineapplejuice", 6)
- bitesize = 2
+ reagents.add_reagent("protein", 4)
+ reagents.add_reagent("cheese", 5)
+ reagents.add_reagent("tomatojuice", 6)
-/obj/item/weapon/reagent_containers/food/snacks/slice/pineapple
- name = "Hawaiian slice"
- desc = "A slice of the accursed pizza."
- icon_state = "pizzamargheritaslice"
+/obj/item/weapon/reagent_containers/food/snacks/pineappleslice
+ name = "ham & pineapple pizza slice"
+ desc = "A slice of contraband."
+ icon = 'icons/obj/food_syn.dmi'
+ icon_state = "pineapple_pizza_slice"
filling_color = "#BAA14C"
bitesize = 2
- center_of_mass = list("x"=16, "y"=13)
- whole_path = /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/pineapple
+ center_of_mass = list("x"=18, "y"=13)
-/obj/item/weapon/reagent_containers/food/snacks/slice/pineapple/filled
- filled = TRUE
+/obj/item/weapon/reagent_containers/food/snacks/pineappleslice/filled
+ nutriment_desc = list("pizza crust" = 5, "tomato" = 5)
+ nutriment_amt = 5
/obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/meatpizza
name = "Meatpizza"
@@ -3550,13 +3510,13 @@
center_of_mass = list("x"=16, "y"=11)
nutriment_desc = list("pizza crust" = 10, "tomato" = 10, "cheese" = 5, "eggplant" = 5, "carrot" = 5, "corn" = 5)
nutriment_amt = 25
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/vegetablepizza/Initialize()
. = ..()
reagents.add_reagent("protein", 5)
reagents.add_reagent("tomatojuice", 6)
reagents.add_reagent("imidazoline", 12)
- bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/slice/vegetablepizza
name = "Vegetable pizza slice"
@@ -3796,9 +3756,6 @@
reagents.add_reagent("radium", 2)
bitesize = 2
-///////////////////////////////////////////
-// new old food stuff from bs12
-///////////////////////////////////////////
/obj/item/weapon/reagent_containers/food/snacks/dough
name = "dough"
desc = "A piece of dough."
@@ -4066,12 +4023,12 @@
filling_color = "#5dadcf"
center_of_mass = list("x"=16, "y"=12)
do_coating_prefix = 0
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/bellefritter/Initialize()
. = ..()
reagents.add_reagent("batter", 10)
reagents.add_reagent("sugar", 5)
- bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/roastedsunflower
name = "sunflower seeds"
@@ -4104,11 +4061,11 @@
center_of_mass = list("x"=16, "y"=15)
nutriment_amt = 20
nutriment_desc = list("chalk" = 6)
+ bitesize = 4
/obj/item/weapon/reagent_containers/food/snacks/liquidfood/Initialize()
. = ..()
reagents.add_reagent("iron", 3)
- bitesize = 4
/obj/item/weapon/reagent_containers/food/snacks/liquidprotein
name = "\improper LiquidProtein Ration"
@@ -4118,12 +4075,12 @@
filling_color = "#A8A8A8"
survivalfood = TRUE
center_of_mass = list("x"=16, "y"=15)
+ bitesize = 4
/obj/item/weapon/reagent_containers/food/snacks/liquidprotein/Initialize()
. = ..()
reagents.add_reagent("protein", 30)
reagents.add_reagent("iron", 3)
- bitesize = 4
/obj/item/weapon/reagent_containers/food/snacks/liquidvitamin
name = "\improper VitaPaste Ration"
@@ -4133,6 +4090,7 @@
filling_color = "#A8A8A8"
survivalfood = TRUE
center_of_mass = list("x"=16, "y"=15)
+ bitesize = 4
/obj/item/weapon/reagent_containers/food/snacks/liquidvitamin/Initialize()
. = ..()
@@ -4141,7 +4099,6 @@
reagents.add_reagent("paracetamol", 5)
reagents.add_reagent("enzyme", 1)
reagents.add_reagent("iron", 3)
- bitesize = 4
/obj/item/weapon/reagent_containers/food/snacks/meatcube
name = "cubed meat"
@@ -4149,11 +4106,11 @@
icon_state = "meatcube"
filling_color = "#7a3d11"
center_of_mass = list("x"=16, "y"=16)
+ bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/meatcube/Initialize()
. = ..()
reagents.add_reagent("protein", 15)
- bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/tastybread
name = "bread tube"
@@ -4198,39 +4155,15 @@
center_of_mass = list("x"=15, "y"=9)
drop_sound = 'sound/items/drop/soda.ogg'
pickup_sound = 'sound/items/pickup/soda.ogg'
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/unajerky/Initialize()
. =..()
reagents.add_reagent("protein", 8)
reagents.add_reagent("capsaicin", 2)
- bitesize = 2
-
-/obj/item/weapon/reagent_containers/food/snacks/croissant
- name = "croissant"
- desc = "True French cuisine."
- filling_color = "#E3D796"
- icon_state = "croissant"
- nutriment_amt = 6
- nutriment_desc = list("french bread" = 6)
-
-/obj/item/weapon/reagent_containers/food/snacks/croissant/Initialize()
- . = ..()
- bitesize = 2
-
-/obj/item/weapon/reagent_containers/food/snacks/meatbun
- name = "meat bun"
- desc = "Chinese street food, in neither China nor a street."
- filling_color = "#DEDEAB"
- icon_state = "meatbun"
- nutriment_amt = 4
-
-/obj/item/weapon/reagent_containers/food/snacks/meatbun/Initialize()
- . = ..()
- bitesize = 2
- reagents.add_reagent("protein", 4)
/obj/item/weapon/reagent_containers/food/snacks/sashimi
- name = "carp sashimi"
+ name = "sashimi"
desc = "Expertly prepared. Hopefully the toxins got removed."
filling_color = "#FFDEFE"
icon_state = "sashimi"
@@ -4346,12 +4279,12 @@
center_of_mass = list("x"=17, "y"=16)
nutriment_amt = 8
nutriment_desc = list("egg" = 4, "chili" = 4)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/devilledegg/Initialize()
. = ..()
reagents.add_reagent("nutriment", 6)
reagents.add_reagent("capsaicin", 2)
- bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/fruitsalad
name = "fruit salad"
@@ -4367,7 +4300,7 @@
bitesize = 4
/obj/item/weapon/reagent_containers/food/snacks/flowerchildsalad
- name = "flowerchild salad"
+ name = "flowerchild poppy salad"
desc = "A fragrant salad."
icon_state = "flowerchildsalad"
filling_color = "#FF3867"
@@ -4380,18 +4313,18 @@
bitesize = 4
/obj/item/weapon/reagent_containers/food/snacks/rosesalad
- name = "flowerchild salad"
+ name = "flowerchild rose salad"
desc = "A fragrant salad."
icon_state = "rosesalad"
filling_color = "#FF3867"
nutriment_amt = 5
nutriment_desc = list("bittersweet" = 10, "iron" = 5)
+ bitesize = 4
/obj/item/weapon/reagent_containers/food/snacks/rosesalad/Initialize()
. = ..()
reagents.add_reagent("nutriment", 10)
reagents.add_reagent("stoxin", 2)
- bitesize = 4
/obj/item/weapon/reagent_containers/food/snacks/eggbowl
name = "egg bowl"
@@ -4408,21 +4341,6 @@
reagents.add_reagent("protein", 4)
bitesize = 2
-/obj/item/weapon/reagent_containers/food/snacks/porkbowl
- name = "pork bowl"
- desc = "A bowl of fried rice with cuts of meat."
- icon_state = "porkbowl"
- trash = /obj/item/trash/snack_bowl
- filling_color = "#FFFBDB"
- nutriment_amt = 6
- nutriment_desc = list("rice" = 2, "meat" = 4)
-
-/obj/item/weapon/reagent_containers/food/snacks/porkbowl/Initialize()
- . = ..()
- reagents.add_reagent("nutriment", 6)
- reagents.add_reagent("protein", 4)
- bitesize = 2
-
/obj/item/weapon/reagent_containers/food/snacks/tortilla
name = "tortilla"
desc = "The base for all your burritos."
@@ -4435,81 +4353,18 @@
reagents.add_reagent("nutriment", 2)
bitesize = 2
-/obj/item/weapon/reagent_containers/food/snacks/meatburrito
- name = "carne asada burrito"
- desc = "The best burrito for meat lovers."
- icon_state = "carneburrito"
- nutriment_amt = 6
- nutriment_desc = list("tortilla" = 3, "meat" = 3)
-
-/obj/item/weapon/reagent_containers/food/snacks/meatburrito/Initialize()
- . = ..()
- reagents.add_reagent("protein", 6)
- bitesize = 2
-
-/obj/item/weapon/reagent_containers/food/snacks/cheeseburrito
- name = "Cheese burrito"
- desc = "It's a burrito filled with cheese."
- icon_state = "cheeseburrito"
- nutriment_amt = 6
- nutriment_desc = list("tortilla" = 3, "cheese" = 3)
-
-/obj/item/weapon/reagent_containers/food/snacks/cheeseburrito/Initialize()
- . = ..()
- reagents.add_reagent("nutriment", 6)
- reagents.add_reagent("protein", 2)
- bitesize = 2
-
-/obj/item/weapon/reagent_containers/food/snacks/fuegoburrito
- name = "fuego phoron burrito"
- desc = "A super spicy burrito."
- icon_state = "fuegoburrito"
- nutriment_amt = 6
- nutriment_desc = list("chili peppers" = 5, "tortilla" = 1)
-
-/obj/item/weapon/reagent_containers/food/snacks/fuegoburrito/Initialize()
- . = ..()
- reagents.add_reagent("nutriment", 6)
- reagents.add_reagent("capsaicin", 4)
- bitesize = 2
-
-/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/cubannachos
name = "cuban nachos"
desc = "That's some dangerously spicy nachos."
icon_state = "cubannachos"
nutriment_amt = 6
nutriment_desc = list("salt" = 1, "cheese" = 2, "chili peppers" = 3)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/cubannachos/Initialize()
. = ..()
reagents.add_reagent("nutriment", 5)
reagents.add_reagent("capsaicin", 4)
- bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/curryrice
name = "curry rice"
@@ -4517,12 +4372,12 @@
icon_state = "curryrice"
nutriment_amt = 6
nutriment_desc = list("salt" = 1, "rice" = 2, "chili peppers" = 3)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/curryrice/Initialize()
. = ..()
reagents.add_reagent("nutriment", 5)
reagents.add_reagent("capsaicin", 4)
- bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/piginblanket
name = "pig in a blanket"
@@ -4557,11 +4412,11 @@
nutriment_amt = 1
nutriment_desc = list("bugflesh" = 1)
w_class = ITEMSIZE_TINY
+ bitesize = 5
/obj/item/weapon/reagent_containers/food/snacks/wormsickly/Initialize()
. = ..()
reagents.add_reagent("fishbait", 10)
- bitesize = 5
/obj/item/weapon/reagent_containers/food/snacks/worm
name = "strange worm"
@@ -4570,11 +4425,11 @@
nutriment_amt = 1
nutriment_desc = list("bugflesh" = 1)
w_class = ITEMSIZE_TINY
+ bitesize = 5
/obj/item/weapon/reagent_containers/food/snacks/worm/Initialize()
. = ..()
reagents.add_reagent("fishbait", 20)
- bitesize = 5
/obj/item/weapon/reagent_containers/food/snacks/wormdeluxe
name = "deluxe worm"
@@ -4583,11 +4438,11 @@
nutriment_amt = 5
nutriment_desc = list("bugflesh" = 1)
w_class = ITEMSIZE_TINY
+ bitesize = 5
/obj/item/weapon/reagent_containers/food/snacks/wormdeluxe/Initialize()
. = ..()
reagents.add_reagent("fishbait", 40)
- bitesize = 5
/obj/item/weapon/reagent_containers/food/snacks/siffruit
name = "pulsing fruit"
@@ -4618,11 +4473,11 @@
icon_state = "bagelplain"
nutriment_amt = 3
nutriment_desc = list("bread" = 1)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/bagelplain/Initialize()
. = ..()
reagents.add_reagent("nutriment", 3)
- bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/bagelsunflower
name = "sunflower seed bagel"
@@ -4630,11 +4485,11 @@
icon_state = "bagelsunflower"
nutriment_amt = 4
nutriment_desc = list("bread" = 1, "sunflower seeds" = 1)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/bagelsunflower/Initialize()
. = ..()
reagents.add_reagent("nutriment", 3)
- bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/bagelcheese
name = "cheese bagel"
@@ -4642,12 +4497,12 @@
icon_state = "bagelcheese"
nutriment_amt = 4
nutriment_desc = list("bread" = 1, "cheese" = 1)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/bagelcheese/Initialize()
. = ..()
reagents.add_reagent("protein", 4)
reagents.add_reagent("nutriment", 4)
- bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/bagelraisin
name = "cinnamon raisin bagel"
@@ -4655,11 +4510,11 @@
icon_state = "bagelraisin"
nutriment_amt = 5
nutriment_desc = list("bread" = 1, "sweetness" = 1)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/bagelraisin/Initialize()
. = ..()
reagents.add_reagent("nutriment", 3)
- bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/bagelpoppy
name = "poppy seed bagel"
@@ -4667,24 +4522,24 @@
icon_state = "bagelpoppy"
nutriment_amt = 5
nutriment_desc = list("bread" = 1, "sweetness" = 1)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/bagelpoppy/Initialize()
. = ..()
reagents.add_reagent("nutriment", 3)
- bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/bageleverything
name = "everything bagel"
desc = "Mmm... Immeasurably unfathomable!"
icon_state = "bageleverything"
- nutriment_amt = 40
+ nutriment_amt = 20
nutriment_desc = list("life" = 1, "death" = 1, "entropy" = 1)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/bageleverything/Initialize()
. = ..()
reagents.add_reagent("phoron", 5)
reagents.add_reagent("defective_nanites", 5)
- bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/bageltwo
name = "two bagels"
@@ -4713,11 +4568,9 @@
center_of_mass = list("x"=16, "y"=16)
nutriment_amt = 9
nutriment_desc = list("Cheese" = 5, "pasta" = 4, "happiness" = 1)
-
-/obj/item/weapon/reagent_containers/food/snacks/macncheese/Initialize()
- . = ..()
bitesize = 3
+
//Code for dipping food in batter
/obj/item/weapon/reagent_containers/food/snacks/afterattack(obj/O as obj, mob/user as mob, proximity)
if(O.is_open_container() && O.reagents && !(istype(O, /obj/item/weapon/reagent_containers/food)) && proximity)
@@ -4922,29 +4775,29 @@
/obj/item/weapon/reagent_containers/food/snacks/chickenkatsu
name = "chicken katsu"
- desc = "A Terran delicacy consisting of chicken fried in a light beer batter."
+ desc = "An Earth delicacy consisting of chicken fried in a light beer batter."
icon = 'icons/obj/food_syn.dmi'
icon_state = "katsu"
trash = /obj/item/trash/plate
filling_color = "#E9ADFF"
center_of_mass = list("x"=16, "y"=16)
do_coating_prefix = 0
+ bitesize = 1.5
/obj/item/weapon/reagent_containers/food/snacks/chickenkatsu/Initialize()
. = ..()
reagents.add_reagent("protein", 6)
reagents.add_reagent("beerbatter", 2)
reagents.add_reagent("oil", 1)
- bitesize = 1.5
/obj/item/weapon/reagent_containers/food/snacks/fries
nutriment_amt = 4
nutriment_desc = list("fries" = 4)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/fries/Initialize()
. = ..()
reagents.add_reagent("oil", 1.2)//This is mainly for the benefit of adminspawning
- bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/microchips
name = "micro chips"
@@ -4976,14 +4829,6 @@
. = ..()
bitesize = 2
-/obj/item/weapon/reagent_containers/food/snacks/meatsteak/Initialize()
- . = ..()
- reagents.add_reagent("protein", 6)
- reagents.add_reagent("triglyceride", 2)
- reagents.add_reagent("sodiumchloride", 1)
- reagents.add_reagent("blackpepper", 1)
- bitesize = 2
-
/obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/crunch
name = "pizza crunch"
desc = "This was once a normal pizza, but it has been coated in batter and deep-fried. Whatever toppings it once had are a mystery, but they're still under there, somewhere..."
@@ -5103,7 +4948,7 @@
/obj/item/weapon/reagent_containers/food/snacks/bacon_stick
name = "eggpop"
- desc = "A bacon wrapped boiled egg, conviently skewered on a wooden stick."
+ desc = "A bacon wrapped boiled egg, conveniently skewered on a wooden stick."
icon = 'icons/obj/food_syn.dmi'
icon_state = "bacon_stick"
@@ -5113,8 +4958,8 @@
reagents.add_reagent("egg", 1)
/obj/item/weapon/reagent_containers/food/snacks/chilied_eggs
- name = "chilied eggs"
- desc = "Three deviled eggs floating in a bowl of meat chili. A popular lunchtime meal for Unathi in Ouerea."
+ name = "Redeemed eggs"
+ desc = "Three deviled eggs floating in a bowl of meat chili. A popular lunchtime meal for Unathi, with mild religious undertones."
icon_state = "chilied_eggs"
trash = /obj/item/trash/snack_bowl
@@ -5123,7 +4968,6 @@
reagents.add_reagent("egg", 6)
reagents.add_reagent("protein", 2)
-
/obj/item/weapon/reagent_containers/food/snacks/cheese_cracker
name = "supreme cheese toast"
desc = "A piece of toast lathered with butter, cheese, spices, and herbs."
@@ -5215,7 +5059,7 @@
reagents.add_reagent("protein", 3)
/obj/item/weapon/reagent_containers/food/snacks/fish_taco
- name = "carp taco"
+ name = "fish taco"
desc = "A questionably cooked fish taco decorated with herbs, spices, and special sauce."
icon = 'icons/obj/food_syn.dmi'
icon_state = "fish_taco"
@@ -5227,8 +5071,8 @@
reagents.add_reagent("seafood",3)
/obj/item/weapon/reagent_containers/food/snacks/nt_muffin
- name = "\improper NtMuffin"
- desc = "A NanoTrasen sponsered biscuit with egg, cheese, and sausage."
+ name = "breakfast muffin"
+ desc = "An english muffin with egg, cheese, and sausage, as sold in fast food joints galaxy-wide."
icon = 'icons/obj/food_syn.dmi'
icon_state = "nt_muffin"
nutriment_desc = list("biscuit" = 3)
@@ -5240,7 +5084,7 @@
/obj/item/weapon/reagent_containers/food/snacks/pineapple_ring
name = "pineapple ring"
- desc = "What the hell is this?"
+ desc = "So retro."
icon = 'icons/obj/food_syn.dmi'
icon_state = "pineapple_ring"
nutriment_desc = list("sweetness" = 2)
@@ -5250,36 +5094,6 @@
. = ..()
reagents.add_reagent("pineapplejuice",3)
-/obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/pineapple
- name = "ham & pineapple pizza"
- desc = "One of the most debated pizzas in existence."
- icon = 'icons/obj/food_syn.dmi'
- icon_state = "pineapple_pizza"
- slice_path = /obj/item/weapon/reagent_containers/food/snacks/pineappleslice
- slices_num = 6
- center_of_mass = list("x"=16, "y"=11)
- nutriment_desc = list("pizza crust" = 10, "tomato" = 10, "ham" = 10)
- nutriment_amt = 30
- bitesize = 2
-
-/obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza/pineapple/Initialize()
- . = ..()
- reagents.add_reagent("protein", 4)
- reagents.add_reagent("cheese", 5)
- reagents.add_reagent("tomatojuice", 6)
-
-/obj/item/weapon/reagent_containers/food/snacks/pineappleslice
- name = "ham & pineapple pizza slice"
- desc = "A slice of contraband."
- icon = 'icons/obj/food_syn.dmi'
- icon_state = "pineapple_pizza_slice"
- filling_color = "#BAA14C"
- bitesize = 2
- center_of_mass = list("x"=18, "y"=13)
-
-/obj/item/weapon/reagent_containers/food/snacks/pineappleslice/filled
- nutriment_desc = list("pizza crust" = 5, "tomato" = 5)
- nutriment_amt = 5
/obj/item/weapon/reagent_containers/food/snacks/burger/bacon
name = "bacon burger"
@@ -5323,17 +5137,6 @@
nutriment_amt = 5
bitesize = 2
-/obj/item/weapon/reagent_containers/food/snacks/berrymuffin
- name = "berry muffin"
- desc = "A delicious and spongy little cake, with berries."
- icon = 'icons/obj/food_syn.dmi'
- icon_state = "berrymuffin"
- filling_color = "#E0CF9B"
- center_of_mass = list("x"=17, "y"=4)
- nutriment_amt = 5
- nutriment_desc = list("sweetness" = 1, "muffin" = 2, "berries" = 2)
- bitesize = 2
-
/obj/item/weapon/reagent_containers/food/snacks/soup/onion
name = "onion soup"
desc = "A soup with layers."
@@ -5685,8 +5488,8 @@
//burritos
/obj/item/weapon/reagent_containers/food/snacks/burrito
- name = "meat burrito"
- desc = "Meat wrapped in a flour tortilla. It's a burrito by definition."
+ name = "chilli burrito"
+ desc = "Minced meat wrapped in a flour tortilla. It's a burrito by definition."
icon = 'icons/obj/food_syn.dmi'
icon_state = "burrito"
bitesize = 4
@@ -5713,22 +5516,12 @@
. = ..()
reagents.add_reagent("tofu", 6)
-/obj/item/weapon/reagent_containers/food/snacks/burrito_spicy
- name = "spicy meat burrito"
- desc = "Meat and chilis wrapped in a flour tortilla."
- icon = 'icons/obj/food_syn.dmi'
- icon_state = "burrito_spicy"
- bitesize = 4
- center_of_mass = list("x"=16, "y"=16)
- nutriment_desc = list("tortilla" = 6)
- nutriment_amt = 6
-
/obj/item/weapon/reagent_containers/food/snacks/burrito_spicy/Initialize()
. = ..()
reagents.add_reagent("protein", 6)
/obj/item/weapon/reagent_containers/food/snacks/burrito_cheese
- name = "meat cheese burrito"
+ name = "carne queso burrito"
desc = "Meat and melted cheese wrapped in a flour tortilla."
icon = 'icons/obj/food_syn.dmi'
icon_state = "burrito_cheese"
@@ -5741,9 +5534,45 @@
. = ..()
reagents.add_reagent("protein", 6)
+/obj/item/weapon/reagent_containers/food/snacks/burrito_hell
+ name = "el diablo"
+ desc = "Meat and an insane amount of chillis packed in a flour tortilla. The Chaplain will see you now."
+ icon = 'icons/obj/food_syn.dmi'
+ icon_state = "burrito_hell"
+ bitesize = 4
+ center_of_mass = list("x"=16, "y"=16)
+ nutriment_desc = list("hellfire" = 6)
+ nutriment_amt = 24// 10 Chilis is a lot.
+
+/obj/item/weapon/reagent_containers/food/snacks/meatburrito
+ name = "carne asada burrito"
+ desc = "Sliced meat and beans, it's another basic burrito!"
+ icon_state = "carneburrito"
+ nutriment_amt = 6
+ nutriment_desc = list("tortilla" = 3, "meat" = 3)
+
+/obj/item/weapon/reagent_containers/food/snacks/meatburrito/Initialize()
+ . = ..()
+ reagents.add_reagent("protein", 6)
+ bitesize = 2
+
+/obj/item/weapon/reagent_containers/food/snacks/cheeseburrito
+ name = "Cheese burrito"
+ desc = "It's a burrito filled with beans and cheese."
+ icon_state = "cheeseburrito"
+ nutriment_amt = 6
+ nutriment_desc = list("tortilla" = 3, "cheese" = 3)
+
+/obj/item/weapon/reagent_containers/food/snacks/cheeseburrito/Initialize()
+ . = ..()
+ reagents.add_reagent("nutriment", 6)
+ reagents.add_reagent("protein", 2)
+ bitesize = 2
+
/obj/item/weapon/reagent_containers/food/snacks/burrito_cheese_spicy
- name = "spicy cheese meat burrito"
- desc = "Meat, melted cheese, and chilis wrapped in a flour tortilla."
+ name = "spicy cheese burrito"
+ desc = "Melted cheese, beans and chillis wrapped in a flour tortilla."
+ icon = 'icons/obj/food_syn.dmi'
icon_state = "burrito_cheese_spicy"
bitesize = 4
center_of_mass = list("x"=16, "y"=16)
@@ -5754,18 +5583,21 @@
. = ..()
reagents.add_reagent("protein", 6)
-/obj/item/weapon/reagent_containers/food/snacks/burrito_hell
- name = "el diablo"
- desc = "Meat and an insane amount of chilis packed in a flour tortilla. The Chaplain will see you now."
- icon = 'icons/obj/food_syn.dmi'
- icon_state = "burrito_hell"
- bitesize = 4
- center_of_mass = list("x"=16, "y"=16)
- nutriment_desc = list("hellfire" = 6)
- nutriment_amt = 24// 10 Chilis is a lot.
+/obj/item/weapon/reagent_containers/food/snacks/fuegoburrito
+ name = "fuego phoron burrito"
+ desc = "A super spicy vegetarian burrito."
+ icon_state = "fuegoburrito"
+ nutriment_amt = 6
+ nutriment_desc = list("chilli peppers" = 5, "tortilla" = 1)
+
+/obj/item/weapon/reagent_containers/food/snacks/fuegoburrito/Initialize()
+ . = ..()
+ reagents.add_reagent("nutriment", 6)
+ reagents.add_reagent("capsaicin", 4)
+ bitesize = 2
/obj/item/weapon/reagent_containers/food/snacks/breakfast_wrap
- name = "breakfast wrap"
+ name = "breakfast burrito"
desc = "Bacon, eggs, cheese, and tortilla grilled to perfection."
icon = 'icons/obj/food_syn.dmi'
icon_state = "breakfast_wrap"
@@ -5777,7 +5609,7 @@
/obj/item/weapon/reagent_containers/food/snacks/burrito_hell/Initialize()
. = ..()
reagents.add_reagent("protein", 9)
- reagents.add_reagent("condensedcapsaicin", 20) //what could possibly go wrong
+ reagents.add_reagent("condensedcapsaicin", 10) //what could possibly go wrong
/obj/item/weapon/reagent_containers/food/snacks/burrito_mystery
name = "mystery meat burrito"
@@ -5803,7 +5635,7 @@
/obj/item/weapon/reagent_containers/food/snacks/red_sun_special
name = "red sun special"
- desc = "One lousy piece of sausage sitting on melted cheese curds. A cheap meal for the Unathi peasants of Moghes."
+ desc = "One lousy piece of sausage sitting on melted cheese curds. A popular utilitarian meal for the Unathi of Moghes."
icon = 'icons/obj/food_syn.dmi'
icon_state = "red_sun_special"
trash = /obj/item/trash/plate
@@ -5858,8 +5690,8 @@
reagents.add_reagent("egg", 2)
/obj/item/weapon/reagent_containers/food/snacks/sliceable/grilled_carp
- name = "korlaaskak"
- desc = "A well-dressed carp, seared to perfection and adorned with herbs and spices. Can be sliced into proper serving sizes."
+ name = "Njarir Merana Grill"
+ desc = "A well-dressed fish, seared to perfection and adorned with herbs and spices in a traditional Nerahni Tajaran style. Can be sliced into proper serving sizes."
icon = 'icons/obj/food_syn.dmi'
icon_state = "grilled_carp"
slice_path = /obj/item/weapon/reagent_containers/food/snacks/grilled_carp_slice
@@ -6053,24 +5885,7 @@
name = "chicken noodle soup"
gender = PLURAL
desc = "A bright bowl of yellow broth with cuts of meat, noodles and carrots."
- icon = 'icons/obj/food_custom.dmi'
- icon_state = "chickennoodlesoup"
- filling_color = "#ead90c"
- nutriment_amt = 6
- nutriment_desc = list("warm soup" = 6)
- center_of_mass = list("x"=16, "y"=5)
-
-/obj/item/weapon/reagent_containers/food/snacks/chickennoodlesoup/Initialize()
- . = ..()
- reagents.add_reagent("protein", 4)
- reagents.add_reagent("water", 5)
- bitesize = 6
-
-/obj/item/weapon/reagent_containers/food/snacks/chickennoodlesoup
- name = "chicken noodle soup"
- gender = PLURAL
- desc = "A bright bowl of yellow broth with cuts of meat, noodles and carrots."
- icon = 'icons/obj/food_custom.dmi'
+ icon = 'icons/obj/food_syn.dmi'
icon_state = "chickennoodlesoup"
filling_color = "#ead90c"
nutriment_amt = 6
@@ -6134,16 +5949,31 @@
bitesize = 3
/obj/item/weapon/reagent_containers/food/snacks/meatbun
- name = "meat bun"
- desc = "A soft, fluffy flour bun also known as baozi. This one is filled with a spiced meat filling."
+ name = "meat and leaf bun"
+ desc = "A soft, fluffy flour bun also known as baozi. This one is filled with a meat and cabbage filling."
+ filling_color = "#DEDEAB"
+ icon = 'icons/obj/food_syn.dmi'
+ icon_state = "meatbun"
+ nutriment_amt = 5
+ nutriment_desc = list("fried meat" = 5)
+ center_of_mass = list("x"=16, "y"=11)
+
+/obj/item/weapon/reagent_containers/food/snacks/meatbun/Initialize()
+ . = ..()
+ bitesize = 2
+ reagents.add_reagent("protein", 4)
+
+/obj/item/weapon/reagent_containers/food/snacks/spicedmeatbun
+ name = "char sui meat bun"
+ desc = "A soft, fluffy flour bun also known as baozi. This one is filled with a traditionally spiced meat filling."
icon = 'icons/obj/food_syn.dmi'
icon_state = "meatbun"
filling_color = "#edd7d7"
nutriment_amt = 5
- nutriment_desc = list("spice" = 5)
+ nutriment_desc = list("char sui" = 5)
center_of_mass = list("x"=16, "y"=11)
-/obj/item/weapon/reagent_containers/food/snacks/meatbun/Initialize()
+/obj/item/weapon/reagent_containers/food/snacks/spicedmeatbun/Initialize()
. = ..()
reagents.add_reagent("protein", 3)
bitesize = 5
@@ -6281,7 +6111,7 @@
reagents.add_reagent("honey", 5)
bitesize = 4
-// SLICEABLE FOODS - SYNNONO MEME FOOD EXPANSION - Credit to Synnono from Aurorastation (again)
+//Sliceables
/obj/item/weapon/reagent_containers/food/snacks/sliceable/keylimepie
name = "key lime pie"
diff --git a/code/modules/food/food/snacks_vr.dm b/code/modules/food/food/snacks_vr.dm
index f881d9e43c3..ba8b78e3aba 100644
--- a/code/modules/food/food/snacks_vr.dm
+++ b/code/modules/food/food/snacks_vr.dm
@@ -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
+
+
diff --git a/code/modules/food/kitchen/cooking_machines/oven.dm b/code/modules/food/kitchen/cooking_machines/oven.dm
index b7a07d599c7..d58df7e6f6c 100644
--- a/code/modules/food/kitchen/cooking_machines/oven.dm
+++ b/code/modules/food/kitchen/cooking_machines/oven.dm
@@ -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, "You [open ? "open" : "close"] the oven door.")
+ to_chat(user, "You [open? "open":"close"] the oven door")
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
- ..()
\ No newline at end of file
+ ..()
diff --git a/code/modules/food/recipes_fryer.dm b/code/modules/food/recipes_fryer.dm
index 1d739ec69df..ba6884b10b3 100644
--- a/code/modules/food/recipes_fryer.dm
+++ b/code/modules/food/recipes_fryer.dm
@@ -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
diff --git a/code/modules/food/recipes_fryer_vr.dm b/code/modules/food/recipes_fryer_vr.dm
new file mode 100644
index 00000000000..a9a4bb3e711
--- /dev/null
+++ b/code/modules/food/recipes_fryer_vr.dm
@@ -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.
diff --git a/code/modules/food/recipes_grill.dm b/code/modules/food/recipes_grill.dm
index 1198660ee75..e51aca24ccc 100644
--- a/code/modules/food/recipes_grill.dm
+++ b/code/modules/food/recipes_grill.dm
@@ -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
diff --git a/code/modules/food/recipes_microwave.dm b/code/modules/food/recipes_microwave.dm
index 216eb0303c4..6780a72fe44 100644
--- a/code/modules/food/recipes_microwave.dm
+++ b/code/modules/food/recipes_microwave.dm
@@ -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
diff --git a/code/modules/food/recipes_microwave_vr.dm b/code/modules/food/recipes_microwave_vr.dm
index 8a4d88fc2a5..6db92d6b016 100644
--- a/code/modules/food/recipes_microwave_vr.dm
+++ b/code/modules/food/recipes_microwave_vr.dm
@@ -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)
diff --git a/code/modules/food/recipes_oven.dm b/code/modules/food/recipes_oven.dm
index b92f04b09ea..e04d437982c 100644
--- a/code/modules/food/recipes_oven.dm
+++ b/code/modules/food/recipes_oven.dm
@@ -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
\ No newline at end of file
diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm
index 62350ff0cbf..20c0b935355 100644
--- a/code/modules/hydroponics/grown.dm
+++ b/code/modules/hydroponics/grown.dm
@@ -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))
diff --git a/code/modules/hydroponics/seed_packets.dm b/code/modules/hydroponics/seed_packets.dm
index 35e84e150dd..cb5bb5c68f6 100644
--- a/code/modules/hydroponics/seed_packets.dm
+++ b/code/modules/hydroponics/seed_packets.dm
@@ -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"
diff --git a/code/modules/hydroponics/seed_storage.dm b/code/modules/hydroponics/seed_storage.dm
index f75d17f63eb..96132945b6c 100644
--- a/code/modules/hydroponics/seed_storage.dm
+++ b/code/modules/hydroponics/seed_storage.dm
@@ -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,
diff --git a/code/modules/hydroponics/seed_storage_vr.dm b/code/modules/hydroponics/seed_storage_vr.dm
index 3cbb56f75ba..1f3ed72b7af 100644
--- a/code/modules/hydroponics/seed_storage_vr.dm
+++ b/code/modules/hydroponics/seed_storage_vr.dm
@@ -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,
diff --git a/code/modules/hydroponics/seedtypes/pineapple.dm b/code/modules/hydroponics/seedtypes/pineapple.dm
new file mode 100644
index 00000000000..9e14b244dcb
--- /dev/null
+++ b/code/modules/hydroponics/seedtypes/pineapple.dm
@@ -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)
\ No newline at end of file
diff --git a/code/modules/hydroponics/seedtypes/spineapple.dm b/code/modules/hydroponics/seedtypes/spineapple.dm
deleted file mode 100644
index b8ff58f5970..00000000000
--- a/code/modules/hydroponics/seedtypes/spineapple.dm
+++ /dev/null
@@ -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)
\ No newline at end of file
diff --git a/code/modules/mob/language/station_vr.dm b/code/modules/mob/language/station_vr.dm
index c0913389e6d..5775d3b5968 100644
--- a/code/modules/mob/language/station_vr.dm
+++ b/code/modules/mob/language/station_vr.dm
@@ -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."
diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
index e28452cc6d8..34653036db0 100644
--- a/code/modules/mob/living/carbon/human/human.dm
+++ b/code/modules/mob/living/carbon/human/human.dm
@@ -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))
diff --git a/code/modules/mob/living/carbon/human/species/station/traits_vr/negative.dm b/code/modules/mob/living/carbon/human/species/station/traits_vr/negative.dm
index 18fba552c37..3340c627be7 100644
--- a/code/modules/mob/living/carbon/human/species/station/traits_vr/negative.dm
+++ b/code/modules/mob/living/carbon/human/species/station/traits_vr/negative.dm
@@ -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"
diff --git a/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm b/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm
index e983ebd398c..7d7508cc751 100644
--- a/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm
+++ b/code/modules/mob/living/carbon/human/species/station/traits_vr/neutral.dm
@@ -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.
\ No newline at end of file
+// 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()
diff --git a/code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm b/code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm
index b9841bb29ee..d1fbf273aa9 100644
--- a/code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm
+++ b/code/modules/mob/living/carbon/human/species/station/traits_vr/positive.dm
@@ -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."
diff --git a/code/modules/mob/living/carbon/human/species/station/traits_vr/trait.dm b/code/modules/mob/living/carbon/human/species/station/traits_vr/trait.dm
index 605da7e5698..a17883884b2 100644
--- a/code/modules/mob/living/carbon/human/species/station/traits_vr/trait.dm
+++ b/code/modules/mob/living/carbon/human/species/station/traits_vr/trait.dm
@@ -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
diff --git a/code/modules/mob/living/carbon/human/update_icons.dm b/code/modules/mob/living/carbon/human/update_icons.dm
index c84f6b4cadd..3ec37d7fbc7 100644
--- a/code/modules/mob/living/carbon/human/update_icons.dm
+++ b/code/modules/mob/living/carbon/human/update_icons.dm
@@ -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)
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index c4b6ad2f584..eb5225c8b82 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -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()
diff --git a/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/subtypes.dm b/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/subtypes.dm
index 68adaed6607..d8f524d7332 100644
--- a/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/subtypes.dm
+++ b/code/modules/mob/living/simple_mob/subtypes/slime/xenobio/subtypes.dm
@@ -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."
diff --git a/code/modules/mob/living/simple_mob/subtypes/vore/c_pet.dm b/code/modules/mob/living/simple_mob/subtypes/vore/c_pet.dm
new file mode 100644
index 00000000000..e4e58f75dc6
--- /dev/null
+++ b/code/modules/mob/living/simple_mob/subtypes/vore/c_pet.dm
@@ -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")
+ .=..()
\ No newline at end of file
diff --git a/code/modules/mob/new_player/preferences_setup_vr.dm b/code/modules/mob/new_player/preferences_setup_vr.dm
index 134fdb77da8..1f01884b602 100644
--- a/code/modules/mob/new_player/preferences_setup_vr.dm
+++ b/code/modules/mob/new_player/preferences_setup_vr.dm
@@ -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)
diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
index 3cc17501f15..d960a516bb4 100644
--- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
+++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Food-Drinks.dm
@@ -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
diff --git a/code/modules/reagents/Chemistry-Recipes.dm b/code/modules/reagents/Chemistry-Recipes.dm
index cfac2582e7c..a49751fa956 100644
--- a/code/modules/reagents/Chemistry-Recipes.dm
+++ b/code/modules/reagents/Chemistry-Recipes.dm
@@ -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"
diff --git a/code/modules/tgui/states.dm b/code/modules/tgui/states.dm
index b2208e4f992..775bf0c5221 100644
--- a/code/modules/tgui/states.dm
+++ b/code/modules/tgui/states.dm
@@ -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)
\ No newline at end of file
+ return tgui_status(user, state)
diff --git a/code/modules/virus2/items_devices.dm b/code/modules/virus2/items_devices.dm
index a69cd8179e8..49d5ef211f6 100644
--- a/code/modules/virus2/items_devices.dm
+++ b/code/modules/virus2/items_devices.dm
@@ -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)
diff --git a/code/modules/vore/appearance/sprite_accessories_vr.dm b/code/modules/vore/appearance/sprite_accessories_vr.dm
index ba0e1d1e3e4..06bb7a34cca 100644
--- a/code/modules/vore/appearance/sprite_accessories_vr.dm
+++ b/code/modules/vore/appearance/sprite_accessories_vr.dm
@@ -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'
diff --git a/code/modules/vore/resizing/resize_vr.dm b/code/modules/vore/resizing/resize_vr.dm
index ea7ec4c5cd8..ea7572fc3a6 100644
--- a/code/modules/vore/resizing/resize_vr.dm
+++ b/code/modules/vore/resizing/resize_vr.dm
@@ -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
diff --git a/config/alienwhitelist.txt b/config/alienwhitelist.txt
index dc88467f4b0..842bd894646 100644
--- a/config/alienwhitelist.txt
+++ b/config/alienwhitelist.txt
@@ -40,6 +40,7 @@ mewchild - Vox
mrsebbi - Xenochimera
natje - Xenochimera
nerdass - Protean
+newyorks - Protean
ontejbjoav - Diona
oreganovulgaris - Xenochimera
owwy - Black-Eyed Shadekin
diff --git a/icons/_nanomaps/tether_nanomap_z1.png b/icons/_nanomaps/tether_nanomap_z1.png
index a7bb05e7bc4..9a0c9f85a86 100644
Binary files a/icons/_nanomaps/tether_nanomap_z1.png and b/icons/_nanomaps/tether_nanomap_z1.png differ
diff --git a/icons/_nanomaps/tether_nanomap_z2.png b/icons/_nanomaps/tether_nanomap_z2.png
index bbd381ae474..107d96eb612 100644
Binary files a/icons/_nanomaps/tether_nanomap_z2.png and b/icons/_nanomaps/tether_nanomap_z2.png differ
diff --git a/icons/effects/setup_backgrounds_vr.dmi b/icons/effects/setup_backgrounds_vr.dmi
new file mode 100644
index 00000000000..66818f57a90
Binary files /dev/null and b/icons/effects/setup_backgrounds_vr.dmi differ
diff --git a/icons/mob/animal_vr.dmi b/icons/mob/animal_vr.dmi
index 801f3ddf335..fee4625fc5f 100644
Binary files a/icons/mob/animal_vr.dmi and b/icons/mob/animal_vr.dmi differ
diff --git a/icons/mob/vore/ears_vr.dmi b/icons/mob/vore/ears_vr.dmi
index 6c259ad5580..5d018fa0e41 100644
Binary files a/icons/mob/vore/ears_vr.dmi and b/icons/mob/vore/ears_vr.dmi differ
diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi
index 3c252b8d352..7b397d3ead6 100644
Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ
diff --git a/icons/obj/clothing/uniforms_1.dmi b/icons/obj/clothing/uniforms_1.dmi
index 9478ef888d2..446758ab5a4 100644
Binary files a/icons/obj/clothing/uniforms_1.dmi and b/icons/obj/clothing/uniforms_1.dmi differ
diff --git a/icons/obj/food.dmi b/icons/obj/food.dmi
index af15334c113..b0f581a18bc 100644
Binary files a/icons/obj/food.dmi and b/icons/obj/food.dmi differ
diff --git a/icons/obj/food_custom.dmi b/icons/obj/food_custom.dmi
index e8be40f76d5..ee26eb7777e 100644
Binary files a/icons/obj/food_custom.dmi and b/icons/obj/food_custom.dmi differ
diff --git a/icons/obj/food_syn.dmi b/icons/obj/food_syn.dmi
index f186b530892..9c8787e5290 100644
Binary files a/icons/obj/food_syn.dmi and b/icons/obj/food_syn.dmi differ
diff --git a/icons/obj/xenoarchaeology.dmi b/icons/obj/xenoarchaeology.dmi
index b4179bcb3a1..d5b0a684d79 100644
Binary files a/icons/obj/xenoarchaeology.dmi and b/icons/obj/xenoarchaeology.dmi differ
diff --git a/maps/submaps/admin_use_vr/kk_mercship.dmm b/maps/submaps/admin_use_vr/kk_mercship.dmm
index b5279064be9..6625ae8cc79 100644
--- a/maps/submaps/admin_use_vr/kk_mercship.dmm
+++ b/maps/submaps/admin_use_vr/kk_mercship.dmm
@@ -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
diff --git a/maps/tether/tether-01-surface1.dmm b/maps/tether/tether-01-surface1.dmm
index 45df6fec18d..d427b973f3a 100644
--- a/maps/tether/tether-01-surface1.dmm
+++ b/maps/tether/tether-01-surface1.dmm
@@ -8130,6 +8130,12 @@
dir = 4
},
/obj/random/junk,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 5
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
/turf/simulated/floor/plating,
/area/maintenance/lowmedbaymaint)
"anG" = (
@@ -9629,13 +9635,6 @@
/obj/effect/floor_decal/industrial/outline/yellow,
/turf/simulated/floor/plating,
/area/maintenance/lower/vacant_site)
-"aqk" = (
-/obj/structure/catwalk,
-/obj/machinery/alarm{
- pixel_y = 22
- },
-/turf/simulated/floor/plating,
-/area/maintenance/lower/vacant_site)
"aql" = (
/obj/structure/catwalk,
/turf/simulated/floor/plating,
@@ -15999,14 +15998,14 @@
/obj/effect/floor_decal/corner/paleblue/bordercorner2{
dir = 6
},
-/obj/machinery/atmospherics/unary/vent_scrubber/on{
- dir = 8
- },
/obj/machinery/power/apc{
name = "south bump";
pixel_y = -28;
req_access = list(67)
},
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+ dir = 8
+ },
/obj/structure/cable/green{
d2 = 8;
icon_state = "0-8"
@@ -16349,7 +16348,11 @@
/turf/simulated/floor/plating,
/area/maintenance/lower/research)
"aAG" = (
-/turf/simulated/mineral,
+/obj/structure/railing,
+/obj/machinery/light/small{
+ dir = 8
+ },
+/turf/simulated/floor/plating,
/area/maintenance/lowmedbaymaint)
"aAH" = (
/obj/structure/cable/green{
@@ -16357,8 +16360,13 @@
d2 = 2;
icon_state = "1-2"
},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+ dir = 8
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+ dir = 8
+ },
/turf/simulated/floor/plating,
/area/maintenance/lowmedbaymaint)
"aAI" = (
@@ -16491,15 +16499,18 @@
d2 = 4;
icon_state = "2-4"
},
+/obj/machinery/power/apc{
+ dir = 1;
+ name = "north bump";
+ pixel_y = 28
+ },
+/obj/structure/cable/green{
+ d2 = 2;
+ icon_state = "0-2"
+ },
/turf/simulated/floor,
/area/maintenance/lowmedbaymaint)
"aAX" = (
-/obj/structure/cable/green{
- icon_state = "16-0"
- },
-/obj/structure/cable/green{
- icon_state = "0-8"
- },
/obj/structure/cable/green{
d1 = 1;
d2 = 8;
@@ -16601,12 +16612,17 @@
d2 = 8;
icon_state = "2-8"
},
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plating,
/area/maintenance/lowmedbaymaint)
"aBi" = (
-/obj/structure/cable{
- icon_state = "1-2"
- },
+/obj/machinery/door/airlock/maintenance/common,
/turf/simulated/floor/plating,
/area/maintenance/lowmedbaymaint)
"aBj" = (
@@ -16678,24 +16694,41 @@
icon_state = "4-8"
},
/turf/simulated/floor/plating,
-/area/maintenance/lowmedbaymaint)
+/area/maintenance/lower/trash_pit)
"aBp" = (
/obj/structure/cable{
icon_state = "4-8"
},
+/obj/structure/cable{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 6
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 6
+ },
+/obj/structure/cable{
+ icon_state = "1-4"
+ },
/turf/simulated/floor/plating,
-/area/maintenance/lowmedbaymaint)
+/area/maintenance/lower/trash_pit)
"aBq" = (
/obj/structure/cable{
d1 = 1;
d2 = 8;
icon_state = "1-8"
},
-/obj/structure/cable{
- icon_state = "4-8"
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 9
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 9
},
/turf/simulated/floor/plating,
-/area/maintenance/lowmedbaymaint)
+/area/maintenance/lower/trash_pit)
"aBr" = (
/obj/structure/cable{
icon_state = "1-8"
@@ -30031,11 +30064,13 @@
/turf/simulated/floor/tiled,
/area/hallway/lower/first_west)
"bbI" = (
-/obj/effect/floor_decal/industrial/warning{
- dir = 4
+/obj/item/weapon/tool/wrench{
+ desc = "The lower jaw seems to keep jiggling...";
+ name = "loose wrench";
+ toolspeed = 3
},
/turf/simulated/floor/plating,
-/area/maintenance/substation/SurfMedsubstation)
+/area/maintenance/lowmedbaymaint)
"bbJ" = (
/obj/structure/cable/green,
/obj/structure/cable/green{
@@ -30076,11 +30111,9 @@
/turf/simulated/floor,
/area/maintenance/substation/SurfMedsubstation)
"bbM" = (
-/obj/effect/floor_decal/industrial/warning/corner{
- dir = 4
- },
+/obj/random/cigarettes,
/turf/simulated/floor/plating,
-/area/maintenance/substation/SurfMedsubstation)
+/area/maintenance/lowmedbaymaint)
"bbN" = (
/obj/structure/cable/green{
d1 = 4;
@@ -30197,6 +30230,10 @@
name = "Powernet Sensor - SurfMed Subgrid";
name_tag = "SurfMed Subgrid"
},
+/obj/machinery/alarm{
+ dir = 1;
+ pixel_y = -25
+ },
/turf/simulated/floor,
/area/maintenance/substation/SurfMedsubstation)
"bbW" = (
@@ -30225,10 +30262,6 @@
d2 = 8;
icon_state = "1-8"
},
-/obj/machinery/alarm{
- dir = 1;
- pixel_y = -25
- },
/obj/machinery/firealarm{
dir = 4;
pixel_x = 26
@@ -30236,15 +30269,7 @@
/turf/simulated/floor,
/area/maintenance/substation/SurfMedsubstation)
"bbZ" = (
-/obj/machinery/power/apc{
- dir = 4;
- name = "east bump";
- pixel_x = 24
- },
-/obj/structure/cable{
- d2 = 8;
- icon_state = "0-8"
- },
+/obj/random/junk,
/turf/simulated/floor/plating,
/area/maintenance/lowmedbaymaint)
"bca" = (
@@ -31079,9 +31104,19 @@
},
/turf/simulated/floor/tiled,
/area/tether/surfacebase/public_garden_one)
+"biK" = (
+/obj/structure/barricade/cutout/mime,
+/turf/simulated/floor/carpet/bcarpet,
+/area/tether/surfacebase/funny/mimeoffice)
"bqI" = (
/turf/simulated/wall,
/area/tether/surfacebase/security/brig/storage)
+"bwr" = (
+/obj/structure/railing{
+ dir = 4
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/lower/trash_pit)
"byn" = (
/obj/effect/floor_decal/steeldecal/steel_decals6,
/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
@@ -31147,6 +31182,8 @@
dir = 8;
pixel_x = -24
},
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/plating,
/area/maintenance/lowmedbaymaint)
"bHR" = (
@@ -31239,6 +31276,28 @@
},
/turf/simulated/floor/tiled,
/area/tether/surfacebase/surface_one_hall)
+"bPH" = (
+/obj/structure/cable/green{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/structure/cable/green{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+ dir = 1
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/lowmedbaymaint)
"bSx" = (
/obj/machinery/atmospherics/unary/vent_pump/on,
/obj/effect/floor_decal/steeldecal/steel_decals4{
@@ -31250,6 +31309,27 @@
/obj/effect/landmark/tram,
/turf/simulated/floor/tiled,
/area/tether/surfacebase/tram)
+"bTt" = (
+/obj/structure/table/rack,
+/obj/item/weapon/weldingtool/mini{
+ desc = "It says 'keychain welder' on the side, but there's no bail to hook it on.";
+ name = "keychain welder";
+ toolspeed = 5
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/lower/trash_pit)
+"bTE" = (
+/obj/structure/railing{
+ dir = 1
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/lowmedbaymaint)
+"bWg" = (
+/obj/machinery/vending/loadout/costume{
+ dir = 4
+ },
+/turf/simulated/floor/plating,
+/area/tether/surfacebase/funny/hideyhole)
"bZC" = (
/turf/simulated/floor/looking_glass,
/area/looking_glass/lg_1)
@@ -31319,6 +31399,13 @@
},
/turf/simulated/floor/tiled/monofloor,
/area/crew_quarters/locker/laundry_arrival)
+"cqg" = (
+/obj/structure/railing{
+ dir = 1
+ },
+/obj/machinery/atmospherics/unary/vent_pump/on,
+/turf/simulated/floor/plating,
+/area/maintenance/lowmedbaymaint)
"cqZ" = (
/obj/effect/floor_decal/borderfloor{
dir = 8
@@ -31443,6 +31530,12 @@
},
/turf/simulated/floor/tiled,
/area/rnd/hallway)
+"cNL" = (
+/obj/machinery/light/small{
+ dir = 8
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/lowmedbaymaint)
"cOq" = (
/obj/random/cutout,
/turf/simulated/floor/plating,
@@ -31484,6 +31577,26 @@
},
/turf/simulated/floor/tiled,
/area/tether/surfacebase/lowernorthhall)
+"cUh" = (
+/obj/item/weapon/storage/belt/utility{
+ desc = "It's full of holes and tears.";
+ name = "raggedy tool-belt"
+ },
+/obj/structure/closet/crate/trashcart,
+/obj/random/junk,
+/obj/random/maintenance/cargo,
+/turf/simulated/floor/plating,
+/area/maintenance/lowmedbaymaint)
+"cUB" = (
+/obj/effect/floor_decal/rust,
+/turf/simulated/floor/plating,
+/area/tether/surfacebase/funny/clownoffice)
+"cWJ" = (
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 8
+ },
+/turf/simulated/floor/carpet/bcarpet,
+/area/tether/surfacebase/funny/mimeoffice)
"cWS" = (
/obj/item/device/radio/beacon,
/turf/simulated/floor/tiled,
@@ -31502,6 +31615,22 @@
},
/turf/simulated/floor/tiled,
/area/crew_quarters/locker/laundry_arrival)
+"cZF" = (
+/obj/structure/catwalk,
+/obj/machinery/alarm{
+ dir = 1;
+ pixel_y = -22
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/lower/vacant_site)
+"cZL" = (
+/obj/structure/railing{
+ dir = 4
+ },
+/obj/random/junk,
+/obj/fiftyspawner/glass,
+/turf/simulated/floor/plating,
+/area/maintenance/lower/trash_pit)
"ddU" = (
/obj/structure/cable/green{
d1 = 1;
@@ -31587,6 +31716,12 @@
},
/turf/simulated/floor/tiled,
/area/tether/surfacebase/surface_one_hall)
+"dtz" = (
+/obj/machinery/light/small{
+ dir = 8
+ },
+/turf/simulated/floor/plating,
+/area/tether/surfacebase/funny/hideyhole)
"dxY" = (
/obj/structure/table/rack,
/obj/item/clothing/mask/gas,
@@ -31694,6 +31829,13 @@
},
/turf/simulated/floor/tiled,
/area/tether/surfacebase/security/lowerhall)
+"dNP" = (
+/obj/machinery/door/airlock/silver{
+ name = "Clown's Office";
+ req_one_access = list(136)
+ },
+/turf/simulated/floor/plating,
+/area/tether/surfacebase/funny/clownoffice)
"dPC" = (
/obj/structure/sink{
dir = 8;
@@ -31704,6 +31846,15 @@
/obj/item/weapon/mop,
/turf/simulated/floor/tiled,
/area/tether/surfacebase/security/brig)
+"dSg" = (
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+ dir = 1
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+ dir = 1
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/lowmedbaymaint)
"dYd" = (
/obj/machinery/firealarm{
layer = 3.3;
@@ -31780,6 +31931,13 @@
/obj/item/weapon/soap/nanotrasen,
/turf/simulated/floor/tiled/freezer,
/area/tether/surfacebase/security/brig/bathroom)
+"emK" = (
+/mob/living/simple_mob/animal/passive/mimepet,
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+ dir = 4
+ },
+/turf/simulated/floor/carpet/bcarpet,
+/area/tether/surfacebase/funny/mimeoffice)
"eow" = (
/obj/effect/floor_decal/borderfloor{
dir = 4
@@ -31864,6 +32022,9 @@
},
/turf/simulated/floor/tiled/freezer,
/area/tether/surfacebase/security/brig/bathroom)
+"eAt" = (
+/turf/simulated/mineral,
+/area/maintenance/lower/trash_pit)
"eBd" = (
/obj/machinery/cryopod,
/obj/effect/floor_decal/corner/lightorange{
@@ -31973,6 +32134,11 @@
},
/turf/simulated/floor/tiled,
/area/tether/surfacebase/surface_one_hall)
+"eWR" = (
+/obj/structure/table/rack,
+/obj/random/maintenance/clean,
+/turf/simulated/floor/plating,
+/area/maintenance/lower/trash_pit)
"fcT" = (
/turf/simulated/floor/looking_glass{
dir = 8
@@ -31983,6 +32149,9 @@
dir = 10
},
/area/looking_glass/lg_1)
+"fkx" = (
+/turf/simulated/floor/carpet/bcarpet,
+/area/tether/surfacebase/funny/mimeoffice)
"fmY" = (
/obj/effect/floor_decal/borderfloor,
/obj/effect/floor_decal/corner/red/border,
@@ -32009,12 +32178,36 @@
/obj/machinery/door/firedoor,
/turf/simulated/floor/tiled/freezer,
/area/tether/surfacebase/security/brig/bathroom)
+"fvL" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/turf/simulated/floor/carpet/bcarpet,
+/area/tether/surfacebase/funny/mimeoffice)
"fyp" = (
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
dir = 1
},
/turf/simulated/floor/tiled,
/area/crew_quarters/locker/laundry_arrival)
+"fAv" = (
+/obj/machinery/door/airlock/silver{
+ name = "Tomfoolery Closet";
+ req_one_access = list(137)
+ },
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/turf/simulated/floor/plating,
+/area/tether/surfacebase/funny/hideyhole)
"fAW" = (
/obj/effect/floor_decal/borderfloor{
dir = 8
@@ -32068,6 +32261,35 @@
/obj/machinery/door/firedoor,
/turf/simulated/floor,
/area/tether/surfacebase/security/gasstorage)
+"fFb" = (
+/obj/machinery/fitness/punching_bag/clown,
+/turf/simulated/floor/plating,
+/area/tether/surfacebase/funny/clownoffice)
+"fFT" = (
+/obj/item/clothing/mask/gas/sexyclown,
+/obj/item/toy/figure/clown,
+/obj/item/clothing/under/sexyclown,
+/obj/item/clothing/shoes/clown_shoes,
+/obj/item/weapon/bedsheet/clown,
+/obj/item/weapon/cartridge/clown,
+/obj/item/weapon/stamp/clown,
+/obj/item/weapon/storage/backpack/clown,
+/obj/item/weapon/bananapeel,
+/obj/item/weapon/reagent_containers/food/snacks/pie,
+/obj/item/weapon/pen/crayon/marker/rainbow,
+/obj/item/weapon/pen/crayon/rainbow,
+/obj/structure/closet/secure_closet{
+ desc = "Where the Clown keeps their hooliganisms.";
+ name = "funny locker";
+ req_one_access = list(136)
+ },
+/turf/simulated/floor/carpet/gaycarpet,
+/area/tether/surfacebase/funny/clownoffice)
+"fKm" = (
+/obj/random/junk,
+/obj/random/maintenance/cargo,
+/turf/simulated/floor/plating,
+/area/maintenance/lowmedbaymaint)
"fLB" = (
/obj/effect/floor_decal/steeldecal/steel_decals6{
dir = 5
@@ -32094,6 +32316,26 @@
},
/turf/simulated/floor/tiled/dark,
/area/tether/surfacebase/security/weaponsrange)
+"fRJ" = (
+/obj/structure/closet{
+ desc = "Dents and old flaky paint blanket this old storage unit.";
+ name = "old locker"
+ },
+/obj/item/weapon/storage/toolbox/lunchbox/mars/filled,
+/obj/item/weapon/storage/belt/fannypack/red,
+/turf/simulated/floor/plating,
+/area/maintenance/lowmedbaymaint)
+"fVG" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/turf/simulated/floor/plating,
+/area/maintenance/lowmedbaymaint)
+"fWT" = (
+/turf/simulated/wall,
+/area/tether/surfacebase/funny/hideyhole)
"geO" = (
/obj/machinery/alarm{
dir = 8;
@@ -32264,6 +32506,12 @@
/obj/item/weapon/beach_ball/holoball,
/turf/simulated/floor/tiled/dark,
/area/tether/surfacebase/security/brig/storage)
+"guO" = (
+/obj/machinery/vending/sovietsoda{
+ dir = 4
+ },
+/turf/simulated/floor/carpet/gaycarpet,
+/area/tether/surfacebase/funny/clownoffice)
"guV" = (
/obj/structure/closet,
/obj/random/drinkbottle,
@@ -32340,6 +32588,22 @@
"gCa" = (
/turf/simulated/wall/r_wall,
/area/tether/surfacebase/security/lowerhall)
+"gEn" = (
+/obj/structure/cable/green{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/turf/simulated/floor/carpet/gaycarpet,
+/area/tether/surfacebase/funny/clownoffice)
+"gIt" = (
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+ dir = 8
+ },
+/turf/simulated/floor/plating,
+/area/tether/surfacebase/funny/hideyhole)
"gJK" = (
/obj/effect/floor_decal/borderfloor{
dir = 1
@@ -32376,17 +32640,41 @@
},
/turf/simulated/floor/tiled,
/area/tether/surfacebase/surface_one_hall)
-"gYx" = (
+"gVF" = (
/obj/machinery/light/small{
dir = 4
},
/turf/simulated/floor/plating,
/area/maintenance/lowmedbaymaint)
+"gWO" = (
+/obj/structure/table/rack,
+/obj/effect/floor_decal/rust,
+/obj/item/toy/crossbow,
+/turf/simulated/floor/plating,
+/area/tether/surfacebase/funny/hideyhole)
+"gYx" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 5
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 5
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/lowmedbaymaint)
"gZN" = (
/turf/simulated/floor/looking_glass{
dir = 9
},
/area/looking_glass/lg_1)
+"haw" = (
+/obj/machinery/light/small{
+ dir = 8
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/lower/trash_pit)
"hco" = (
/obj/machinery/atmospherics/pipe/simple/hidden/green{
dir = 9
@@ -32548,6 +32836,11 @@
/obj/effect/landmark/looking_glass,
/turf/simulated/floor/looking_glass/center,
/area/looking_glass/lg_1)
+"hGe" = (
+/obj/item/toy/plushie/lizardplushie/resh,
+/obj/item/toy/syndicateballoon,
+/turf/simulated/floor/plating,
+/area/tether/surfacebase/funny/clownoffice)
"hMu" = (
/obj/effect/floor_decal/steeldecal/steel_decals6{
dir = 6
@@ -32710,6 +33003,18 @@
},
/turf/simulated/floor/tiled/steel_grid,
/area/tether/surfacebase/lowernortheva)
+"iaI" = (
+/obj/structure/cable{
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/lower/trash_pit)
"icB" = (
/obj/effect/floor_decal/borderfloor/corner{
dir = 8
@@ -32732,6 +33037,14 @@
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/turf/simulated/floor/tiled,
/area/rnd/hallway)
+"idk" = (
+/obj/item/weapon/tool/wirecutters{
+ desc = "It gets jammed a lot.";
+ name = "janky wirecutters";
+ toolspeed = 2
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/lowmedbaymaint)
"iee" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -32794,6 +33107,10 @@
},
/turf/simulated/floor/tiled,
/area/crew_quarters/locker/laundry_arrival)
+"iwQ" = (
+/obj/item/weapon/stool,
+/turf/simulated/floor/carpet/gaycarpet,
+/area/tether/surfacebase/funny/clownoffice)
"ixF" = (
/obj/structure/cable/green{
d1 = 1;
@@ -32856,6 +33173,10 @@
},
/turf/simulated/floor/tiled/freezer,
/area/tether/surfacebase/security/brig/bathroom)
+"iWa" = (
+/obj/structure/bed/chair/bar_stool,
+/turf/simulated/floor/carpet/bcarpet,
+/area/tether/surfacebase/funny/mimeoffice)
"iWx" = (
/obj/effect/floor_decal/corner/lightorange{
dir = 5
@@ -32880,6 +33201,15 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/maintenance/lower/public_garden_maintenence)
+"jcT" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 5
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/lowmedbaymaint)
"jio" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 9
@@ -32929,6 +33259,25 @@
},
/turf/simulated/floor/tiled,
/area/tether/surfacebase/surface_one_hall)
+"jnN" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 9
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 5
+ },
+/turf/simulated/floor/carpet/bcarpet,
+/area/tether/surfacebase/funny/mimeoffice)
+"joK" = (
+/obj/structure/table/standard{
+ name = "plastic table frame"
+ },
+/obj/item/device/flashlight/lamp/green,
+/turf/simulated/floor/carpet/gaycarpet,
+/area/tether/surfacebase/funny/clownoffice)
"jva" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
@@ -32938,6 +33287,21 @@
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled,
/area/tether/surfacebase/tram)
+"jvS" = (
+/obj/effect/floor_decal/rust,
+/obj/machinery/power/apc{
+ dir = 8;
+ pixel_x = -25
+ },
+/obj/structure/cable{
+ d2 = 2;
+ icon_state = "0-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 6
+ },
+/turf/simulated/floor/plating,
+/area/tether/surfacebase/funny/hideyhole)
"jzW" = (
/obj/structure/bed/chair{
dir = 8
@@ -33014,6 +33378,11 @@
},
/turf/simulated/floor/tiled,
/area/tether/surfacebase/security/lowerhall)
+"jOI" = (
+/turf/simulated/wall{
+ can_open = 1
+ },
+/area/maintenance/lowmedbaymaint)
"jPk" = (
/obj/structure/catwalk,
/obj/machinery/atmospherics/pipe/simple/visible/scrubbers,
@@ -33068,6 +33437,16 @@
},
/turf/simulated/floor/tiled,
/area/tether/surfacebase/security/lowerhall)
+"jXR" = (
+/obj/machinery/power/apc{
+ dir = 1;
+ pixel_y = 25
+ },
+/obj/structure/cable/green{
+ icon_state = "0-4"
+ },
+/turf/simulated/floor/carpet/gaycarpet,
+/area/tether/surfacebase/funny/clownoffice)
"kbZ" = (
/obj/effect/floor_decal/borderfloor{
dir = 9
@@ -33168,12 +33547,41 @@
"kmb" = (
/turf/simulated/floor/tiled/dark,
/area/tether/surfacebase/security/brig)
+"ksA" = (
+/obj/structure/cable/green{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers{
+ dir = 4
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/lowmedbaymaint)
+"ksK" = (
+/obj/structure/railing,
+/turf/simulated/floor/plating,
+/area/maintenance/lowmedbaymaint)
"kuB" = (
/obj/effect/floor_decal/industrial/warning,
/obj/machinery/atmospherics/pipe/simple/hidden/supply,
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/tiled/dark,
/area/tether/surfacebase/security/weaponsrange)
+"kuT" = (
+/obj/structure/grille,
+/obj/structure/window/reinforced/full,
+/obj/structure/window/reinforced{
+ dir = 4
+ },
+/obj/structure/window/reinforced{
+ dir = 8
+ },
+/turf/simulated/floor/plating,
+/area/tether/surfacebase/funny/mimeoffice)
"kwN" = (
/obj/effect/floor_decal/borderfloor/shifted{
dir = 1
@@ -33265,6 +33673,15 @@
},
/turf/simulated/floor/tiled,
/area/tether/surfacebase/security/lowerhall)
+"kAn" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 5
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 9
+ },
+/turf/simulated/floor/plating,
+/area/tether/surfacebase/funny/clownoffice)
"kAG" = (
/obj/effect/floor_decal/borderfloor{
dir = 4
@@ -33423,6 +33840,10 @@
},
/turf/simulated/floor/tiled,
/area/crew_quarters/visitor_laundry)
+"lbd" = (
+/obj/random/maintenance/cargo,
+/turf/simulated/floor/plating,
+/area/maintenance/lowmedbaymaint)
"lbu" = (
/obj/effect/floor_decal/borderfloorwhite,
/obj/effect/floor_decal/corner/paleblue/border,
@@ -33508,14 +33929,8 @@
/turf/simulated/floor/plating,
/area/maintenance/lower/mining_eva)
"lry" = (
-/obj/structure/catwalk,
-/obj/structure/closet,
-/obj/random/maintenance/clean,
-/obj/random/maintenance/cargo,
-/obj/random/maintenance/cargo,
-/obj/random/drinkbottle,
-/turf/simulated/floor/plating,
-/area/maintenance/lower/vacant_site)
+/turf/simulated/wall,
+/area/tether/surfacebase/funny/mimeoffice)
"lwL" = (
/obj/machinery/door/airlock/glass_security{
id_tag = "brigouter";
@@ -33574,6 +33989,30 @@
/obj/machinery/holoposter,
/turf/simulated/wall,
/area/hallway/lower/first_west)
+"lBO" = (
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 9
+ },
+/turf/simulated/floor/plating,
+/area/tether/surfacebase/funny/hideyhole)
+"lCH" = (
+/obj/structure/table/standard{
+ name = "plastic table frame"
+ },
+/obj/item/inflatable/door,
+/obj/machinery/alarm{
+ pixel_y = 25
+ },
+/turf/simulated/floor/carpet/gaycarpet,
+/area/tether/surfacebase/funny/clownoffice)
"lDW" = (
/obj/structure/catwalk,
/obj/structure/cable{
@@ -33682,6 +34121,10 @@
},
/turf/simulated/floor/tiled,
/area/tether/surfacebase/surface_one_hall)
+"lPQ" = (
+/obj/item/stack/cable_coil/random_belt,
+/turf/simulated/floor/plating,
+/area/maintenance/lowmedbaymaint)
"lQu" = (
/obj/item/weapon/reagent_containers/glass/bucket,
/obj/structure/table/steel,
@@ -33769,6 +34212,12 @@
},
/turf/simulated/floor/tiled,
/area/tether/surfacebase/lowernorthhall)
+"lVt" = (
+/obj/machinery/vending/coffee{
+ dir = 1
+ },
+/turf/simulated/floor/carpet/bcarpet,
+/area/tether/surfacebase/funny/mimeoffice)
"lWT" = (
/obj/effect/floor_decal/borderfloor{
dir = 1
@@ -33787,10 +34236,26 @@
},
/turf/simulated/floor/tiled,
/area/tether/surfacebase/public_garden_one)
+"lXE" = (
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 8
+ },
+/turf/simulated/floor/plating,
+/area/tether/surfacebase/funny/hideyhole)
+"meS" = (
+/turf/simulated/floor/carpet/gaycarpet,
+/area/tether/surfacebase/funny/clownoffice)
"mhu" = (
/obj/structure/closet/secure_closet/brig,
/turf/simulated/floor/tiled/dark,
/area/tether/surfacebase/security/brig/storage)
+"miP" = (
+/obj/item/weapon/bananapeel,
+/turf/simulated/floor/plating,
+/area/tether/surfacebase/funny/clownoffice)
+"mnN" = (
+/turf/simulated/floor/plating,
+/area/maintenance/lower/trash_pit)
"mon" = (
/obj/effect/floor_decal/borderfloor{
dir = 6
@@ -33807,6 +34272,10 @@
},
/turf/simulated/floor/tiled,
/area/tether/surfacebase/surface_one_hall)
+"mrj" = (
+/obj/machinery/gear_painter,
+/turf/simulated/floor/plating,
+/area/maintenance/lower/trash_pit)
"mrO" = (
/obj/effect/floor_decal/corner/lightorange{
dir = 5
@@ -33867,6 +34336,14 @@
},
/turf/simulated/floor/tiled,
/area/tether/surfacebase/security/lowerhall)
+"mxi" = (
+/obj/structure/table/alien/blue{
+ desc = "Is this imported?";
+ name = "obscure table"
+ },
+/obj/random/drinkbottle,
+/turf/simulated/floor/carpet/bcarpet,
+/area/tether/surfacebase/funny/mimeoffice)
"mAR" = (
/obj/structure/cable/green{
d1 = 1;
@@ -34087,6 +34564,20 @@
"naC" = (
/turf/simulated/wall/r_wall,
/area/medical/virologyisolation)
+"naO" = (
+/obj/structure/table/rack,
+/obj/effect/floor_decal/rust,
+/obj/item/weapon/soap/syndie,
+/obj/item/weapon/bananapeel,
+/turf/simulated/floor/plating,
+/area/tether/surfacebase/funny/hideyhole)
+"nbj" = (
+/obj/machinery/door/airlock/engineering{
+ name = "Medbay Substation";
+ req_one_access = list(11,24,5)
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/substation/SurfMedsubstation)
"ndH" = (
/obj/structure/cable/green{
d1 = 1;
@@ -34165,6 +34656,27 @@
/obj/random/trash_pile,
/turf/simulated/floor/plating,
/area/maintenance/lower/vacant_site)
+"nlO" = (
+/obj/machinery/door/airlock/silver{
+ name = "Clown's Office";
+ req_one_access = list(136)
+ },
+/obj/structure/cable/green{
+ d1 = 1;
+ d2 = 2;
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/turf/simulated/floor/plating,
+/area/tether/surfacebase/funny/clownoffice)
+"nlT" = (
+/turf/simulated/wall/r_wall,
+/area/tether/surfacebase/funny/hideyhole)
+"nmb" = (
+/obj/structure/closet/crate/bin,
+/turf/simulated/floor/carpet/bcarpet,
+/area/tether/surfacebase/funny/mimeoffice)
"nmf" = (
/obj/structure/cable/green{
d1 = 4;
@@ -34188,6 +34700,18 @@
},
/turf/simulated/floor/tiled,
/area/tether/surfacebase/security/brig)
+"nmA" = (
+/obj/machinery/door/airlock/silver{
+ name = "Mime's Office";
+ req_one_access = list(138)
+ },
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/turf/simulated/floor/plating,
+/area/tether/surfacebase/funny/mimeoffice)
"nmD" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -34342,6 +34866,15 @@
},
/turf/simulated/floor/tiled/techmaint,
/area/maintenance/lower/vacant_site)
+"nMH" = (
+/obj/structure/closet{
+ desc = "Dents and old flaky paint blanket this old storage unit.";
+ name = "old locker"
+ },
+/obj/item/weapon/storage/toolbox/lunchbox/filled,
+/obj/random/plushielarge,
+/turf/simulated/floor/plating,
+/area/maintenance/lowmedbaymaint)
"nOB" = (
/obj/structure/disposalpipe/segment{
dir = 4
@@ -34368,6 +34901,27 @@
},
/turf/simulated/floor/tiled,
/area/tether/surfacebase/security/lowerhall)
+"nUG" = (
+/obj/structure/table/rack,
+/obj/item/weapon/tool/prybar/red{
+ desc = "Haven't I seen this before?";
+ name = "old red crowbar";
+ toolspeed = 3
+ },
+/obj/machinery/light/small{
+ dir = 1
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/lower/trash_pit)
+"nZj" = (
+/obj/structure/undies_wardrobe,
+/obj/structure/cable{
+ d1 = 1;
+ d2 = 8;
+ icon_state = "1-8"
+ },
+/turf/simulated/floor/carpet/bcarpet,
+/area/tether/surfacebase/funny/mimeoffice)
"ocx" = (
/obj/machinery/door/firedoor/glass,
/obj/machinery/door/blast/regular{
@@ -34379,6 +34933,10 @@
"odn" = (
/turf/simulated/wall,
/area/tether/surfacebase/security/lowerhall)
+"oeB" = (
+/obj/structure/closet/crate,
+/turf/simulated/floor/plating,
+/area/maintenance/lower/trash_pit)
"ofS" = (
/obj/effect/floor_decal/borderfloor,
/obj/effect/floor_decal/corner/mauve/border,
@@ -34435,6 +34993,19 @@
/obj/machinery/atmospherics/pipe/manifold/hidden/scrubbers,
/turf/simulated/floor/tiled,
/area/tether/surfacebase/surface_one_hall)
+"ojM" = (
+/obj/effect/floor_decal/rust,
+/obj/structure/table/standard{
+ name = "plastic table frame"
+ },
+/obj/item/clothing/head/caphat/formal/fedcover/fedcoversec{
+ desc = "An officer's cap shamelessly bootlegged by the Clown College's security force.";
+ name = "Clown Officer's Cap"
+ },
+/obj/item/clothing/mask/smokable/pipe/cobpipe,
+/obj/item/weapon/flame/lighter/zippo/ironic,
+/turf/simulated/floor/plating,
+/area/tether/surfacebase/funny/clownoffice)
"okO" = (
/obj/machinery/door/airlock{
name = "Visitation";
@@ -34443,6 +35014,13 @@
/obj/machinery/door/firedoor,
/turf/simulated/floor/tiled/dark,
/area/tether/surfacebase/security/brig)
+"okP" = (
+/obj/structure/railing{
+ dir = 1
+ },
+/obj/random/maintenance/cargo,
+/turf/simulated/floor/plating,
+/area/maintenance/lower/trash_pit)
"oli" = (
/obj/machinery/light,
/obj/effect/floor_decal/borderfloor,
@@ -34524,6 +35102,10 @@
},
/turf/simulated/floor/tiled,
/area/tether/surfacebase/surface_one_hall)
+"oto" = (
+/obj/item/pizzavoucher,
+/turf/simulated/floor/plating,
+/area/maintenance/lowmedbaymaint)
"ovG" = (
/obj/effect/floor_decal/borderfloor{
dir = 1
@@ -34586,6 +35168,18 @@
},
/turf/simulated/floor/tiled/freezer,
/area/tether/surfacebase/security/brig/bathroom)
+"oId" = (
+/obj/structure/closet{
+ desc = "Dents and old flaky paint blanket this old storage unit.";
+ name = "old locker"
+ },
+/obj/item/weapon/storage/toolbox/lunchbox/heart,
+/obj/random/plushie,
+/turf/simulated/floor/plating,
+/area/maintenance/lowmedbaymaint)
+"oKn" = (
+/turf/simulated/mineral,
+/area/tether/surfacebase/funny/clownoffice)
"oKY" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -34606,6 +35200,27 @@
},
/turf/simulated/floor/tiled,
/area/tether/surfacebase/surface_one_hall)
+"oMv" = (
+/obj/structure/table/alien/blue{
+ desc = "Is this imported?";
+ name = "obscure table"
+ },
+/obj/random/action_figure,
+/obj/machinery/light/small{
+ dir = 1
+ },
+/turf/simulated/floor/carpet/bcarpet,
+/area/tether/surfacebase/funny/mimeoffice)
+"oMC" = (
+/obj/machinery/light/small{
+ dir = 8
+ },
+/turf/simulated/floor/carpet/gaycarpet,
+/area/tether/surfacebase/funny/clownoffice)
+"oPH" = (
+/obj/random/pizzabox,
+/turf/simulated/floor/plating,
+/area/maintenance/lowmedbaymaint)
"oQm" = (
/obj/effect/floor_decal/borderfloor/corner,
/obj/structure/cable{
@@ -34728,6 +35343,15 @@
"pCj" = (
/turf/simulated/wall/r_wall,
/area/tether/surfacebase/security/brig)
+"pIG" = (
+/obj/structure/cable{
+ icon_state = "1-2"
+ },
+/obj/machinery/door/airlock/maintenance/common,
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/turf/simulated/floor/plating,
+/area/maintenance/lower/trash_pit)
"pKE" = (
/obj/structure/cable/green{
d1 = 4;
@@ -34739,10 +35363,48 @@
},
/turf/simulated/floor/tiled,
/area/tether/surfacebase/security/brig)
+"pKR" = (
+/obj/random/junk,
+/obj/random/junk,
+/turf/simulated/floor/plating,
+/area/maintenance/lower/trash_pit)
+"pUI" = (
+/obj/structure/railing{
+ dir = 1
+ },
+/obj/random/junk,
+/turf/simulated/floor/plating,
+/area/maintenance/lower/trash_pit)
+"pVp" = (
+/obj/machinery/alarm{
+ alarm_id = "pen_nine";
+ breach_detection = 0;
+ dir = 1;
+ pixel_y = -22
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/lowmedbaymaint)
"pZb" = (
/obj/structure/closet/wardrobe/orange,
/turf/simulated/floor/tiled/dark,
/area/tether/surfacebase/security/brig/storage)
+"qaa" = (
+/obj/structure/closet{
+ desc = "Dents and old flaky paint blanket this old storage unit.";
+ name = "old locker"
+ },
+/obj/item/weapon/storage/toolbox/lunchbox/syndicate,
+/obj/item/clothing/head/cakehat,
+/obj/random/mech_toy,
+/turf/simulated/floor/plating,
+/area/maintenance/lowmedbaymaint)
+"qbw" = (
+/obj/structure/bed/chair/bar_stool,
+/obj/machinery/alarm{
+ pixel_y = 25
+ },
+/turf/simulated/floor/carpet/bcarpet,
+/area/tether/surfacebase/funny/mimeoffice)
"qfJ" = (
/obj/machinery/atmospherics/unary/vent_scrubber/on,
/obj/effect/floor_decal/steeldecal/steel_decals4{
@@ -34752,6 +35414,26 @@
/obj/effect/landmark/tram,
/turf/simulated/floor/tiled,
/area/tether/surfacebase/tram)
+"qhk" = (
+/obj/structure/cable/green{
+ d1 = 4;
+ d2 = 8;
+ icon_state = "4-8"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/obj/machinery/alarm{
+ alarm_id = "pen_nine";
+ breach_detection = 0;
+ dir = 1;
+ pixel_y = -22
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/lowmedbaymaint)
"qhq" = (
/obj/structure/cable/green{
d1 = 1;
@@ -34763,6 +35445,17 @@
/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
/turf/simulated/floor/tiled,
/area/tether/surfacebase/surface_one_hall)
+"qhr" = (
+/obj/random/junk,
+/obj/random/maintenance/cargo,
+/turf/simulated/floor/plating,
+/area/maintenance/lower/trash_pit)
+"qhs" = (
+/obj/structure/table/rack,
+/obj/item/toy/crossbow,
+/obj/item/weapon/coin/silver,
+/turf/simulated/floor/plating,
+/area/tether/surfacebase/funny/hideyhole)
"qjE" = (
/obj/effect/floor_decal/borderfloor/shifted{
dir = 1
@@ -34785,6 +35478,13 @@
/obj/structure/disposalpipe/trunk,
/turf/simulated/floor/tiled,
/area/tether/surfacebase/security/brig)
+"qnZ" = (
+/obj/structure/table/rack,
+/obj/item/toy/tennis/yellow,
+/obj/item/toy/tennis/green,
+/obj/item/toy/tennis/blue,
+/turf/simulated/floor/plating,
+/area/tether/surfacebase/funny/hideyhole)
"qor" = (
/obj/structure/catwalk,
/turf/simulated/floor/plating,
@@ -34840,6 +35540,10 @@
},
/turf/simulated/wall,
/area/maintenance/substation/cargostoresubstation)
+"qJl" = (
+/obj/machinery/door/airlock/maintenance/common,
+/turf/simulated/floor/plating,
+/area/maintenance/lower/trash_pit)
"qJT" = (
/obj/structure/table/reinforced,
/obj/item/clothing/glasses/gglasses{
@@ -34903,6 +35607,12 @@
/obj/machinery/atmospherics/unary/vent_scrubber/on,
/turf/simulated/floor/tiled,
/area/crew_quarters/locker)
+"qPs" = (
+/obj/structure/railing{
+ dir = 1
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/lower/trash_pit)
"qPR" = (
/obj/machinery/atmospherics/pipe/manifold/hidden/green{
dir = 1
@@ -34959,6 +35669,25 @@
},
/turf/simulated/floor/tiled,
/area/tether/surfacebase/surface_one_hall)
+"qSJ" = (
+/obj/machinery/power/apc{
+ dir = 4;
+ name = "east bump";
+ pixel_x = 24
+ },
+/obj/structure/cable{
+ d2 = 2;
+ icon_state = "0-2"
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/lower/trash_pit)
+"qVi" = (
+/obj/structure/railing{
+ dir = 1
+ },
+/obj/machinery/atmospherics/unary/vent_scrubber/on,
+/turf/simulated/floor/plating,
+/area/maintenance/lowmedbaymaint)
"qWk" = (
/obj/machinery/light,
/obj/structure/disposalpipe/segment{
@@ -35031,6 +35760,18 @@
},
/turf/simulated/floor/tiled,
/area/tether/surfacebase/tram)
+"rse" = (
+/obj/structure/bed/double/padded,
+/obj/item/weapon/bedsheet/mimedouble,
+/turf/simulated/floor/carpet/bcarpet,
+/area/tether/surfacebase/funny/mimeoffice)
+"ruj" = (
+/obj/machinery/door/airlock/silver{
+ name = "Mime's Office";
+ req_one_access = list(138)
+ },
+/turf/simulated/floor/plating,
+/area/tether/surfacebase/funny/mimeoffice)
"rww" = (
/obj/structure/stairs/south,
/obj/structure/railing{
@@ -35062,6 +35803,11 @@
},
/turf/simulated/floor/tiled,
/area/tether/surfacebase/surface_one_hall)
+"rxD" = (
+/obj/structure/bed/double/padded,
+/obj/item/weapon/bedsheet/clowndouble,
+/turf/simulated/floor/carpet/gaycarpet,
+/area/tether/surfacebase/funny/clownoffice)
"rxG" = (
/obj/effect/floor_decal/industrial/warning,
/obj/machinery/alarm{
@@ -35070,6 +35816,16 @@
},
/turf/simulated/floor/tiled/dark,
/area/tether/surfacebase/security/weaponsrange)
+"rzF" = (
+/obj/structure/table/rack,
+/obj/effect/floor_decal/rust,
+/obj/item/toy/bouquet/fake,
+/obj/item/weapon/reagent_containers/spray/waterflower,
+/obj/machinery/alarm{
+ pixel_y = 25
+ },
+/turf/simulated/floor/plating,
+/area/tether/surfacebase/funny/hideyhole)
"rzZ" = (
/obj/structure/cable/green{
d1 = 1;
@@ -35126,6 +35882,16 @@
},
/turf/simulated/floor/tiled/dark,
/area/tether/surfacebase/security/weaponsrange)
+"rIU" = (
+/obj/effect/landmark/start{
+ name = "Mime"
+ },
+/turf/simulated/floor/carpet/bcarpet,
+/area/tether/surfacebase/funny/mimeoffice)
+"rNu" = (
+/obj/random/cutout,
+/turf/simulated/floor/plating,
+/area/maintenance/lower/trash_pit)
"rOh" = (
/obj/machinery/disposal,
/turf/simulated/floor/tiled/dark,
@@ -35277,6 +36043,10 @@
},
/turf/simulated/floor/tiled,
/area/tether/surfacebase/surface_one_hall)
+"saF" = (
+/mob/living/simple_mob/animal/passive/honkpet,
+/turf/simulated/floor/plating,
+/area/tether/surfacebase/funny/clownoffice)
"sbD" = (
/obj/effect/floor_decal/corner/lightgrey{
dir = 9
@@ -35398,6 +36168,15 @@
dir = 6
},
/area/looking_glass/lg_1)
+"sJX" = (
+/obj/structure/catwalk,
+/obj/structure/closet,
+/obj/random/maintenance/clean,
+/obj/random/maintenance/cargo,
+/obj/random/maintenance/cargo,
+/obj/random/drinkbottle,
+/turf/simulated/floor/plating,
+/area/maintenance/lower/vacant_site)
"sLi" = (
/obj/structure/catwalk,
/obj/structure/cable{
@@ -35447,6 +36226,9 @@
/obj/machinery/atmospherics/unary/vent_pump/on,
/turf/simulated/floor/tiled,
/area/tether/surfacebase/security/brig)
+"tdg" = (
+/turf/simulated/mineral,
+/area/maintenance/lowmedbaymaint)
"tdh" = (
/turf/simulated/floor/tiled,
/area/tether/surfacebase/security/brig)
@@ -35539,6 +36321,12 @@
},
/turf/simulated/floor/tiled/techfloor,
/area/maintenance/lower/mining_eva)
+"tHb" = (
+/obj/machinery/light/small{
+ dir = 1
+ },
+/turf/simulated/floor/carpet/bcarpet,
+/area/tether/surfacebase/funny/mimeoffice)
"tLx" = (
/obj/effect/floor_decal/industrial/warning,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -35598,6 +36386,9 @@
},
/turf/simulated/floor/tiled,
/area/tether/surfacebase/surface_one_hall)
+"tOe" = (
+/turf/simulated/floor/plating,
+/area/tether/surfacebase/funny/clownoffice)
"tQH" = (
/obj/machinery/camera/network/security{
dir = 10
@@ -35627,6 +36418,15 @@
},
/turf/simulated/floor/tiled,
/area/tether/surfacebase/lowernorthhall)
+"tRD" = (
+/obj/machinery/alarm{
+ alarm_id = "pen_nine";
+ breach_detection = 0;
+ dir = 1;
+ pixel_y = -22
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/lower/trash_pit)
"tRJ" = (
/obj/effect/floor_decal/spline/plain{
dir = 10
@@ -35684,6 +36484,20 @@
/obj/structure/disposalpipe/segment,
/turf/simulated/floor/tiled,
/area/tether/surfacebase/surface_one_hall)
+"tXi" = (
+/obj/structure/table/rack,
+/obj/item/toy/stickhorse,
+/obj/item/toy/katana,
+/turf/simulated/floor/plating,
+/area/tether/surfacebase/funny/hideyhole)
+"uaa" = (
+/obj/structure/plushie/beepsky,
+/obj/item/clothing/shoes/galoshes{
+ desc = "These feel light and shitty.";
+ name = "budget galoshes"
+ },
+/turf/simulated/floor/plating,
+/area/tether/surfacebase/funny/mimeoffice)
"ubK" = (
/obj/structure/disposalpipe/segment{
dir = 8;
@@ -35750,6 +36564,11 @@
/obj/random/maintenance/research,
/turf/simulated/floor/tiled/techfloor,
/area/maintenance/lower/xenoflora)
+"utQ" = (
+/obj/fiftyspawner/steel,
+/obj/random/junk,
+/turf/simulated/floor/plating,
+/area/maintenance/lowmedbaymaint)
"uuu" = (
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
dir = 4
@@ -35762,6 +36581,15 @@
},
/turf/simulated/floor/tiled,
/area/crew_quarters/locker)
+"uwD" = (
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 10
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 10
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/lowmedbaymaint)
"uxF" = (
/obj/machinery/door/firedoor/glass,
/obj/machinery/door/airlock/glass{
@@ -35960,6 +36788,9 @@
dir = 4
},
/area/tether/surfacebase/surface_one_hall)
+"uVK" = (
+/turf/simulated/wall,
+/area/tether/surfacebase/funny/clownoffice)
"vfy" = (
/obj/effect/floor_decal/borderfloor{
dir = 4
@@ -35999,6 +36830,15 @@
/obj/effect/floor_decal/steeldecal/steel_decals4,
/turf/simulated/floor/tiled,
/area/tether/surfacebase/security/brig)
+"vkL" = (
+/obj/machinery/power/apc{
+ pixel_y = -25
+ },
+/obj/structure/cable{
+ icon_state = "0-4"
+ },
+/turf/simulated/floor/carpet/bcarpet,
+/area/tether/surfacebase/funny/mimeoffice)
"vlJ" = (
/obj/effect/floor_decal/borderfloor{
dir = 1
@@ -36027,10 +36867,45 @@
},
/turf/simulated/floor/tiled,
/area/rnd/hallway)
+"vuO" = (
+/obj/structure/disposalpipe/segment{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+ dir = 4
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+ dir = 4
+ },
+/turf/simulated/floor/plating,
+/area/maintenance/lowmedbaymaint)
+"vBy" = (
+/obj/machinery/vending/cigarette{
+ dir = 1
+ },
+/turf/simulated/floor/carpet/bcarpet,
+/area/tether/surfacebase/funny/mimeoffice)
"vCb" = (
/obj/machinery/portable_atmospherics/powered/pump/filled,
/turf/simulated/floor/plating,
/area/maintenance/lower/mining_eva)
+"vCn" = (
+/obj/item/weapon/pen/crayon/mime,
+/obj/item/weapon/pen/crayon/marker/mime,
+/obj/item/weapon/cartridge/mime,
+/obj/item/weapon/bedsheet/mime,
+/obj/item/toy/figure/mime,
+/obj/item/clothing/under/sexymime,
+/obj/item/clothing/shoes/mime,
+/obj/item/clothing/mask/gas/sexymime,
+/obj/item/clothing/head/soft/mime,
+/obj/structure/closet/secure_closet{
+ desc = "...";
+ name = "silent storage";
+ req_one_access = list(138)
+ },
+/turf/simulated/floor/carpet/bcarpet,
+/area/tether/surfacebase/funny/mimeoffice)
"vDb" = (
/obj/effect/floor_decal/borderfloor,
/obj/machinery/atmospherics/pipe/simple/hidden/supply{
@@ -36056,6 +36931,19 @@
},
/turf/simulated/floor/tiled,
/area/tether/surfacebase/surface_one_hall)
+"vEc" = (
+/obj/machinery/light/small,
+/turf/simulated/floor/carpet/gaycarpet,
+/area/tether/surfacebase/funny/clownoffice)
+"vHE" = (
+/obj/structure/closet{
+ desc = "Dents and old flaky paint blanket this old storage unit.";
+ name = "old locker"
+ },
+/obj/item/weapon/storage/toolbox/lunchbox/cat/filled,
+/obj/item/clothing/head/chefhat,
+/turf/simulated/floor/plating,
+/area/maintenance/lowmedbaymaint)
"vHP" = (
/obj/effect/floor_decal/borderfloor{
dir = 8
@@ -36186,6 +37074,20 @@
},
/turf/simulated/floor/tiled,
/area/tether/surfacebase/security/brig)
+"wvv" = (
+/obj/effect/floor_decal/rust,
+/turf/simulated/floor/plating,
+/area/tether/surfacebase/funny/hideyhole)
+"wvV" = (
+/obj/structure/cable{
+ d1 = 2;
+ d2 = 4;
+ icon_state = "2-4"
+ },
+/obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers,
+/turf/simulated/floor/plating,
+/area/maintenance/lowmedbaymaint)
"wwm" = (
/obj/effect/floor_decal/corner/lightorange{
dir = 5
@@ -36274,12 +37176,27 @@
},
/turf/simulated/floor/plating,
/area/maintenance/lower/mining_eva)
+"wOK" = (
+/obj/effect/floor_decal/rust,
+/obj/machinery/light/small{
+ dir = 4
+ },
+/turf/simulated/floor/plating,
+/area/tether/surfacebase/funny/clownoffice)
"wQS" = (
/obj/effect/floor_decal/steeldecal/steel_decals6{
dir = 5
},
/turf/simulated/floor/tiled,
/area/tether/surfacebase/security/brig)
+"wRb" = (
+/obj/structure/table/alien/blue{
+ desc = "Is this imported?";
+ name = "obscure table"
+ },
+/obj/random/mre,
+/turf/simulated/floor/carpet/bcarpet,
+/area/tether/surfacebase/funny/mimeoffice)
"wRe" = (
/obj/structure/stairs/south,
/obj/structure/railing{
@@ -36340,6 +37257,11 @@
},
/turf/simulated/floor/tiled,
/area/tether/surfacebase/security/brig)
+"wWK" = (
+/obj/structure/table/rack,
+/obj/fiftyspawner/wood,
+/turf/simulated/floor/plating,
+/area/maintenance/lower/trash_pit)
"wXW" = (
/obj/effect/shuttle_landmark{
base_area = /area/tether/surfacebase/tram;
@@ -36416,6 +37338,12 @@
},
/turf/simulated/floor/tiled/white,
/area/medical/virology)
+"xts" = (
+/obj/machinery/atmospherics/unary/vent_pump/on{
+ dir = 8
+ },
+/turf/simulated/floor/carpet/gaycarpet,
+/area/tether/surfacebase/funny/clownoffice)
"xtS" = (
/obj/machinery/power/apc{
dir = 4;
@@ -36427,6 +37355,12 @@
},
/turf/simulated/floor/tiled/freezer,
/area/tether/surfacebase/security/brig/bathroom)
+"xtV" = (
+/obj/machinery/atmospherics/unary/vent_scrubber/on{
+ dir = 4
+ },
+/turf/simulated/floor/carpet/gaycarpet,
+/area/tether/surfacebase/funny/clownoffice)
"xzn" = (
/obj/effect/floor_decal/steeldecal/steel_decals6{
dir = 9
@@ -36469,6 +37403,24 @@
},
/turf/simulated/floor/tiled/techmaint,
/area/looking_glass/lg_1)
+"xQi" = (
+/obj/effect/floor_decal/rust,
+/obj/structure/barricade/cutout/clown,
+/turf/simulated/floor/plating,
+/area/tether/surfacebase/funny/clownoffice)
+"xRP" = (
+/obj/effect/floor_decal/rust,
+/obj/effect/landmark/start{
+ name = "Clown"
+ },
+/turf/simulated/floor/plating,
+/area/tether/surfacebase/funny/clownoffice)
+"xSF" = (
+/obj/structure/table/rack,
+/obj/effect/floor_decal/rust,
+/obj/item/toy/bouquet,
+/turf/simulated/floor/plating,
+/area/tether/surfacebase/funny/hideyhole)
"xVX" = (
/obj/structure/railing{
dir = 8
@@ -36492,6 +37444,19 @@
},
/turf/simulated/floor/tiled,
/area/tether/surfacebase/security/brig)
+"xZq" = (
+/obj/structure/table/rack,
+/obj/item/clothing/gloves/fyellow{
+ desc = "These are what qualifies as a quality product these days?";
+ name = "insulted gloves"
+ },
+/obj/item/weapon/card/id/gold{
+ access = list(746);
+ desc = "Did someone spraypaint this card?";
+ name = "captians id card"
+ },
+/turf/simulated/floor/plating,
+/area/tether/surfacebase/funny/hideyhole)
"yaU" = (
/obj/effect/floor_decal/borderfloor{
dir = 1
@@ -36521,6 +37486,18 @@
/obj/machinery/atmospherics/unary/vent_scrubber/on,
/turf/simulated/floor/tiled,
/area/tether/surfacebase/security/brig)
+"yey" = (
+/obj/structure/sink{
+ dir = 8;
+ pixel_x = -12;
+ pixel_y = 2
+ },
+/obj/structure/mirror{
+ dir = 4;
+ pixel_x = -25
+ },
+/turf/simulated/floor/carpet/bcarpet,
+/area/tether/surfacebase/funny/mimeoffice)
"ygY" = (
/obj/effect/floor_decal/borderfloor{
dir = 1
@@ -36548,6 +37525,10 @@
},
/turf/simulated/floor/tiled,
/area/rnd/hallway)
+"ylH" = (
+/obj/machinery/fitness/punching_bag/clown,
+/turf/simulated/floor/carpet/gaycarpet,
+/area/tether/surfacebase/funny/clownoffice)
(1,1,1) = {"
aaa
@@ -50350,22 +51331,22 @@ uHS
awF
axM
aeU
-aah
-aah
-aah
-aah
+bbI
+fKm
+lPQ
+bTE
akA
aAG
-aah
+tdg
aef
aEZ
aFP
aGw
aHi
aef
-aah
-aah
-aah
+eAt
+eAt
+eAt
agM
agM
aoa
@@ -50492,22 +51473,22 @@ atO
awC
axN
aeU
-aah
-aah
-aah
-aah
-akA
-aAG
-aah
+bbM
+lbd
+aAI
+cqg
+jcT
+ksK
+tdg
aef
aFa
aFQ
aGw
aHk
aef
-aah
-aah
-aah
+eWR
+mnN
+oeB
ahx
anI
aob
@@ -50634,22 +51615,22 @@ atO
awC
axO
aeU
-aah
-aah
-aah
-aah
+bbZ
+utQ
+lbd
+qVi
anF
-aAG
-aah
+ksK
+tdg
aef
aFb
aFZ
aGJ
aHq
aef
-aah
-aah
-aah
+nUG
+mnN
+wWK
ahx
ait
aoc
@@ -50776,22 +51757,22 @@ atO
awG
aed
aeU
-aah
-aah
-aah
-aah
-akA
-aAG
-aah
+oPH
+idk
+bbZ
+bTE
+vuO
+ksK
+tdg
aef
aef
aef
aef
aef
aef
-aah
-aah
-aah
+mrj
+mnN
+bTt
ahx
anJ
aod
@@ -50922,18 +51903,18 @@ axP
axP
axP
axP
-akA
-aAI
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
+vuO
+ksK
+oKn
+oKn
+oKn
+ylH
+oMC
+guO
+aaU
+rNu
+mnN
+oeB
ahx
ahx
ahx
@@ -51065,23 +52046,23 @@ ayZ
aAc
aAi
asT
-aAI
-adK
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
+pVp
+uVK
+oKn
+fFb
+meS
+meS
+meS
+aaU
+aaU
+qJl
+aaU
+aaU
+bwr
+bwr
+cZL
+haw
+pKR
apF
aqP
apF
@@ -51208,22 +52189,22 @@ aAd
axP
aAz
aAI
-adK
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
+uVK
+jXR
+xtV
+tOe
+xRP
+meS
+dNP
+ahk
+ahk
+ahk
+ahk
+ahk
+ahk
+ahk
+okP
+tRD
apF
aqQ
arl
@@ -51348,14 +52329,14 @@ ayC
azE
axP
axP
-axK
-aAI
-adK
-aah
-aah
-aah
-aah
-aah
+bPH
+ksA
+nlO
+gEn
+kAn
+miP
+saF
+cUB
aaU
aaU
aaU
@@ -51363,9 +52344,9 @@ aaU
aaU
aaU
aaU
-aah
-aah
-aah
+ahk
+qPs
+qhr
apF
aqP
arl
@@ -51492,12 +52473,12 @@ axP
aeF
axK
aAI
-adK
-aah
-aah
-aah
-aah
-aah
+uVK
+joK
+xts
+meS
+tOe
+xQi
aaU
agQ
ahp
@@ -51505,9 +52486,9 @@ ahC
akI
anf
aaU
-aah
-aah
-aah
+ahk
+pUI
+mnN
apF
abQ
arj
@@ -51634,12 +52615,12 @@ axP
aeJ
aAz
aAI
-adK
-aah
-aah
-aah
-aah
-aah
+uVK
+lCH
+iwQ
+tOe
+meS
+vEc
aaU
agS
ahq
@@ -51647,7 +52628,7 @@ ajP
akY
anq
aaU
-aaU
+qJl
aaU
aaU
aaU
@@ -51770,18 +52751,18 @@ auo
adG
ayf
aff
+oto
aAI
-aAI
-aAD
+jOI
afy
azT
aAa
-adK
-aah
-aah
-bbj
-bbj
-bbj
+uVK
+ojM
+cUB
+wOK
+fFT
+rxD
bbj
agT
ahr
@@ -51918,23 +52899,23 @@ azV
azV
azV
aAb
-adK
-aah
+aAD
+uVK
+bbj
+bbj
bbj
bbj
-bbI
-bbM
bbj
ahg
ahz
ajZ
alD
anL
-aaU
-aaU
-aaU
-aaU
-aaU
+lry
+ruj
+lry
+lry
+lry
aql
arl
apF
@@ -52059,9 +53040,9 @@ azH
azW
aAe
aeE
-aAz
-adK
-aah
+qhk
+aAD
+hGe
bbj
bbx
bbJ
@@ -52072,11 +53053,11 @@ ahA
ahk
ahA
aop
-aaU
-aah
-aah
-aah
-apF
+lry
+fkx
+yey
+nmb
+lry
aql
arl
apF
@@ -52202,8 +53183,8 @@ azX
aAg
aeE
aAz
-adK
-aah
+aAD
+uVK
bbj
bby
bbK
@@ -52214,11 +53195,11 @@ aaU
aaU
aaU
aBo
-aaU
-aah
-aah
-aah
-apF
+lry
+tHb
+emK
+vkL
+lry
aql
arl
apF
@@ -52344,23 +53325,23 @@ azY
aAh
aeE
aAz
-adK
+aAD
aAW
bbr
bbz
bbL
bbY
-bbj
-aAG
-aAG
-aAG
-aAG
+nbj
+mnN
+mnN
+mnN
+qSJ
aBp
-aAD
-aah
-aah
-apF
-apF
+nmA
+fvL
+jnN
+nZj
+lry
aql
nlo
apF
@@ -52492,16 +53473,16 @@ bbj
bbA
bbj
bbj
-bbj
-aAG
-aAG
-aAG
-aAI
-aBp
-aAD
-aah
-aah
-apF
+aaU
+aaU
+aaU
+aaU
+aaU
+iaI
+lry
+qbw
+cWJ
+lVt
lry
aql
aql
@@ -52628,25 +53609,25 @@ azW
aAe
aeE
aAI
-aAI
-aAI
-aAI
+dSg
+wvV
+fVG
aBh
-aBi
-aBi
+fVG
+fVG
bHK
-aBi
-aBi
-aBi
-aBi
+fVG
+fVG
+fVG
+pIG
aBq
-aAD
-aah
-aah
-apF
-aqk
+lry
+mxi
+fkx
+vBy
+lry
aqj
-aql
+cZF
apF
aah
aah
@@ -52769,26 +53750,26 @@ azJ
azX
aAg
aeE
-aAI
-aAI
+cUh
+uwD
gYx
pdo
-aAI
-aAI
-aAI
-aAI
-aAI
-aAI
-aAI
-aAI
-bbZ
+gVF
aAD
-aah
-aah
-apF
-aql
-aql
+aBi
+aAD
+aAD
+aAD
+aAD
+lry
+lry
+lry
+oMv
+rIU
+biK
+lry
aql
+sJX
apF
aah
aah
@@ -52911,24 +53892,24 @@ azH
azY
aAh
aeE
-aAD
-aAD
-aAD
-aAD
-aAD
-aAD
-aAD
-aAD
-aAD
-aAD
-aAD
-aAD
-aAD
-aAD
-aah
-aah
-apF
-apF
+fWT
+fWT
+fAv
+fWT
+fWT
+fWT
+aAI
+aAI
+aAI
+cNL
+aAI
+lry
+uaa
+lry
+wRb
+fkx
+vCn
+lry
apF
apF
apF
@@ -53052,25 +54033,25 @@ aeE
aeE
aeE
aeE
-aeE
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
+nlT
+naO
+jvS
+lBO
+dtz
+qnZ
+fWT
+nMH
+oId
+fRJ
+qaa
+vHE
+lry
+lry
+lry
+iWa
+fkx
+rse
+lry
aah
aah
aah
@@ -53194,25 +54175,25 @@ azA
naC
aah
aah
+fWT
+rzF
+lXE
+gIt
+wvv
+tXi
+fWT
+aAD
+aAD
+aAD
+aAD
+aAD
+aAD
aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
-aad
-aah
-aah
-aad
-aad
-aah
-aah
-aah
-aah
-aah
+lry
+kuT
+kuT
+lry
+lry
aah
aah
aty
@@ -53336,13 +54317,13 @@ azB
naC
aah
aah
-aah
-aah
-aah
-aah
-aah
-aah
-aah
+fWT
+qhs
+xZq
+bWg
+xSF
+gWO
+fWT
aah
aah
aad
@@ -53350,9 +54331,9 @@ aad
aad
aad
aad
+aah
+aad
aad
-aah
-aah
aah
aah
aah
@@ -53478,13 +54459,13 @@ azC
naC
aah
aah
-aah
-aah
-aah
-aah
-aad
-aad
-aad
+fWT
+fWT
+fWT
+fWT
+fWT
+fWT
+fWT
aad
aad
aad
diff --git a/maps/tether/tether-02-surface2.dmm b/maps/tether/tether-02-surface2.dmm
index 3b7cead3e94..e625f9bfb5e 100644
--- a/maps/tether/tether-02-surface2.dmm
+++ b/maps/tether/tether-02-surface2.dmm
@@ -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
diff --git a/maps/tether/tether_areas.dm b/maps/tether/tether_areas.dm
index 1f004c4b177..575bacd2d7f 100644
--- a/maps/tether/tether_areas.dm
+++ b/maps/tether/tether_areas.dm
@@ -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"
diff --git a/vorestation.dme b/vorestation.dme
index 1bea426fad4..499eb5205c5 100644
--- a/vorestation.dme
+++ b/vorestation.dme
@@ -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"