Food 4 thought

This commit is contained in:
klaasjared
2021-05-20 23:11:19 -04:00
committed by VirgoBot
parent 20e0fcd2d9
commit c380e04b0a
19 changed files with 1567 additions and 437 deletions
+153
View File
@@ -214,3 +214,156 @@
/obj/item/trash/attack(mob/M as mob, mob/living/user as mob)
return
/obj/item/trash/beef //ADDITION 04/11/2021
name = "empty beef can"
icon_state = "beef"
drop_sound = 'sound/items/drop/soda.ogg'
pickup_sound = 'sound/items/pickup/soda.ogg'
/obj/item/trash/beans //ADDITION 04/11/2021
name = "empty bean can"
icon_state = "beans"
drop_sound = 'sound/items/drop/soda.ogg'
pickup_sound = 'sound/items/pickup/soda.ogg'
/obj/item/trash/spinach //ADDITION 04/11/2021
name = "empty spinach can"
icon_state = "spinach"
drop_sound = 'sound/items/drop/soda.ogg'
pickup_sound = 'sound/items/pickup/soda.ogg'
/obj/item/trash/fishegg //ADDITION 04/11/2021
name = "empty fisheggs can"
icon_state = "fisheggs"
drop_sound = 'sound/items/drop/soda.ogg'
pickup_sound = 'sound/items/pickup/soda.ogg'
/obj/item/trash/carpegg //ADDITION 04/11/2021
name = "empty carpeggs can"
icon_state = "carpeggs"
drop_sound = 'sound/items/drop/soda.ogg'
pickup_sound = 'sound/items/pickup/soda.ogg'
/obj/item/trash/salo //ADDITION 04/11/2021
name = "salo pack"
icon_state = "pigfat"
/obj/item/trash/croutons //ADDITION 04/11/2021
name = "suhariki pack"
icon_state = "croutons"
/obj/item/trash/squid //ADDITION 04/11/2021
name = "calamari pack"
icon_state = "squid"
/obj/item/trash/driedfish //ADDITION 04/11/2021
name = "vobla pack"
icon_state = "driedfish"
/obj/item/trash/lunacakewrap //ADDITION 04/11/2021
name = "cake wrapper"
icon_state = "cakewrap"
/obj/item/trash/mochicakewrap //ADDITION 04/11/2021
name = "cake wrapper"
icon_state = "mochicakewrap"
/obj/item/trash/mooncakewrap //ADDITION 04/11/2021
name = "cake wrapper"
icon_state = "mooncakewrap"
/obj/item/trash/tidegobs//ADDITION 04/11/2021
name = "tide gob bag"
icon_state = "tidegobs"
/obj/item/trash/saturno//ADDITION 04/11/2021
name = "\improper saturn-Os bag"
icon_state = "saturn0s"
/obj/item/trash/jupiter//ADDITION 04/11/2021
name = "gello cup"
icon_state = "jupiter"
/obj/item/trash/pluto//ADDITION 04/11/2021
name = "rod bag"
icon_state = "pluto"
/obj/item/trash/venus//ADDITION 04/11/2021
name = "hot cakes bag"
icon_state = "venus"
/obj/item/trash/mars//ADDITION 04/11/2021
name = "frouka box"
icon_state = "mars"
/obj/item/trash/oort//ADDITION 04/11/2021
name = "oort rock bag"
icon_state = "oort"
/obj/item/trash/weebonuts//ADDITION 04/11/2021
name = "red alert nuts bag"
icon_state = "weebonuts"
/obj/item/trash/stick//ADDITION 04/11/2021
name = "stick"
desc = "a stick from some snack or other food item, not even useful as crafting material."
icon_state = "stick"
/obj/item/trash/maps//ADDITION 04/13/2021
name = "empty MAPS can"
icon_state = "maps"
drop_sound = 'sound/items/drop/soda.ogg'
pickup_sound = 'sound/items/pickup/soda.ogg'
/obj/item/trash/spacer_cake_wrap//ADDITION 04/14/2021
name = "snack cake wrapper"
icon_state = "spacer_cake_wrap"
/obj/item/trash/sun_snax//ADDITION 04/14/2021
name = "sun snax bag"
icon_state = "sun_snax"
/obj/item/trash/wasabi_peas//ADDITION 04/14/2021
name = "wasabi peas bag"
icon_state = "wasabi_peas"
/obj/item/trash/namagashi//ADDITION 04/14/2021
name = "namagashi bag"
icon_state = "namagashi"
/obj/item/trash/pocky//ADDITION 04/14/2021
name = "pocky bag"
icon_state = "pocky"
/obj/item/trash/appleberry//ADDITION 04/14/2021
name = "appleberry can"
icon_state = "appleberry"
drop_sound = 'sound/items/drop/soda.ogg'
pickup_sound = 'sound/items/pickup/soda.ogg'
/obj/item/trash/hakarl//ADDITION 04/22/2021
name = "\improper Indigo Co. Hákarl bag"
icon_state = "hakarl"
/obj/item/trash/pretzel//ADDITION 04/22/2021
name = "\improper Value Pretzel Snack"
icon_state = "pretzel"
/obj/item/trash/sweetration//ADDITION 04/20/2021
name = "desert ration bag"
icon_state = "baseration"
/obj/item/trash/genration//ADDITION 04/20/2021
name = "generic ration bag"
icon_state = "genration"
/obj/item/trash/meatration//ADDITION 04/20/2021
name = "meat ration bag"
icon_state = "meatration"
/obj/item/trash/vegration//ADDITION 04/20/2021
name = "veggie ration bag"
icon_state = "vegration"
@@ -231,3 +231,32 @@ obj/item/clothing/mask/chewable/Destroy()
color = reagents.get_color()
update_icon()
/obj/item/weapon/storage/box/pocky //ADDITION 04/17/2021
name = "\improper Totemo yoi Pocky"
desc = "A bundle of chocolate-coated bisquit sticks."
icon = 'icons/obj/food_snacks.dmi'
icon_state = "pockys"
item_state = "pocky"
w_class = 1
starts_with = list(/obj/item/clothing/mask/chewable/candy/pocky = 8)
can_hold = list(/obj/item/clothing/mask/chewable/candy/pocky)
use_sound = 'sound/items/drop/paper.ogg'
drop_sound = 'sound/items/drop/wrapper.ogg'
max_storage_space = 8
foldable = null
trash = /obj/item/trash/pocky
/obj/item/clothing/mask/chewable/candy/pocky //ADDITION 04/17/2021
name = "chocolate pocky"
desc = "A chocolate-coated biscuit stick."
icon_state = "pocky"
item_state = "pocky"
/obj/item/clothing/mask/chewable/candy/pocky/process()
chew()
if(chewtime < 1)
spitout(0)
/obj/item/clothing/mask/chewable/candy/pocky/Initialize()
. = ..()
reagents.add_reagent("chocolate" = 10)
+1 -1
View File
@@ -439,7 +439,7 @@
/obj/item/weapon/reagent_containers/food/snacks/popcorn,
/obj/item/weapon/reagent_containers/food/snacks/sosjerky,
/obj/item/weapon/reagent_containers/food/snacks/no_raisin,
/obj/item/weapon/reagent_containers/food/snacks/spacetwinkie,
/obj/item/weapon/reagent_containers/food/snacks/packaged/spacetwinkie,
/obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers,
/obj/item/weapon/reagent_containers/food/snacks/poppypretzel,
/obj/item/weapon/reagent_containers/food/snacks/baguette,
+1 -1
View File
@@ -247,7 +247,7 @@ Loot piles can be depleted, if loot_depleted is turned on. Note that players wh
/obj/item/trash/waffles,
/obj/item/weapon/reagent_containers/food/snacks/xenomeat/spidermeat,
/obj/item/weapon/reagent_containers/food/snacks/mysterysoup,
/obj/item/weapon/reagent_containers/food/snacks/hotdog/old,
/obj/item/weapon/reagent_containers/food/snacks/old/hotdog,
/obj/item/pizzabox/old,
/obj/item/ammo_casing/spent,
/obj/item/stack/rods{amount = 5},
+1 -1
View File
@@ -531,7 +531,7 @@
/obj/item/weapon/reagent_containers/food/snacks/no_raisin
price_tag = 1
/obj/item/weapon/reagent_containers/food/snacks/spacetwinkie
/obj/item/weapon/reagent_containers/food/snacks/packaged/spacetwinkie
price_tag = 1
/obj/item/weapon/reagent_containers/food/snacks/skrellsnacks
+200 -17
View File
@@ -159,7 +159,7 @@
/obj/item/weapon/reagent_containers/food/snacks/semki = 12,
/obj/item/weapon/reagent_containers/food/snacks/sosjerky = 12,
/obj/item/weapon/reagent_containers/food/snacks/no_raisin = 12,
/obj/item/weapon/reagent_containers/food/snacks/spacetwinkie = 12,
/obj/item/weapon/reagent_containers/food/snacks/packaged/spacetwinkie = 12,
/obj/item/weapon/reagent_containers/food/snacks/tastybread = 12,
/obj/item/weapon/reagent_containers/food/snacks/skrellsnacks = 6,
/obj/item/weapon/reagent_containers/food/snacks/cookiesnack = 6,
@@ -189,7 +189,7 @@
/obj/item/weapon/reagent_containers/food/snacks/semki = 1,
/obj/item/weapon/reagent_containers/food/snacks/sosjerky = 2,
/obj/item/weapon/reagent_containers/food/snacks/no_raisin = 1,
/obj/item/weapon/reagent_containers/food/snacks/spacetwinkie = 1,
/obj/item/weapon/reagent_containers/food/snacks/packaged/spacetwinkie = 1,
/obj/item/weapon/reagent_containers/food/snacks/tastybread = 2,
/obj/item/weapon/reagent_containers/food/snacks/skrellsnacks = 4,
/obj/item/weapon/storage/box/gum = 15,
@@ -509,10 +509,10 @@
/obj/item/seeds/glowshroom = 2,
/obj/item/seeds/libertymycelium = 2,
/obj/item/seeds/mtearseed = 2,
/obj/item/seeds/nettleseed = 2,
/obj/item/seeds/reishimycelium = 2,
/obj/item/seeds/reishimycelium = 2,
/obj/item/seeds/shandseed = 2,)
/obj/item/seeds/nettleseed = 2,
/obj/item/seeds/reishimycelium = 2,
/obj/item/seeds/reishimycelium = 2,
/obj/item/seeds/shandseed = 2,)
premium = list(/obj/item/weapon/reagent_containers/spray/waterflower = 1)
/**
@@ -585,17 +585,6 @@
/obj/item/trash/bowl = 10) //VOREStation Add
contraband = list(/obj/item/weapon/material/knife/butch = 2)
/obj/machinery/vending/sovietsoda
name = "BODA"
desc = "An old sweet water vending machine,how did this end up here?"
icon_state = "sovietsoda"
product_ads = "For Tsar and Country.;Have you fulfilled your nutrition quota today?;Very nice!;We are simple people, for this is all we eat.;If there is a person, there is a problem. If there is no person, then there is no problem."
products = list(/obj/item/weapon/reagent_containers/food/drinks/cans/boda = 30, //ADDITION 04/03/2021
/obj/item/weapon/reagent_containers/food/drinks/cans/kompot = 20) //ADDITION 04/03/2021
contraband = list(/obj/item/weapon/reagent_containers/food/drinks/cans/kvass = 20) //ADDITION 04/03/2021
idle_power_usage = 211 //refrigerator - believe it or not, this is actually the average power consumption of a refrigerated vending machine according to NRCan.
vending_sound = "machines/vending/vending_cans.ogg"
/obj/machinery/vending/tool
name = "YouTool"
desc = "Tools for tools."
@@ -874,3 +863,197 @@
/obj/item/clothing/under/color/red = 5,
/obj/item/weapon/reagent_containers/pill/adminordrazine = 10,
/obj/item/weapon/tool/crowbar = 1)
////////////////////ancient_vend (Hot Food - Old) (ADDED 04/11/2021)////////////////////////////////////////////////////
/obj/machinery/vending/hotfood
name = "\improper Hot Foods!"
desc = "An old vending machine promising 'hot foods'. You doubt any of its contents are still edible."
vend_delay = 40
icon_state = "hotfood"
products = list(/obj/item/weapon/reagent_containers/food/snacks/old/pizza = 3,
/obj/item/weapon/reagent_containers/food/snacks/old/burger = 2,
/obj/item/weapon/reagent_containers/food/snacks/old/horseburger = 2,
/obj/item/weapon/reagent_containers/food/snacks/old/fries = 4,
/obj/item/weapon/reagent_containers/food/snacks/old/hotdog = 3,
/obj/item/weapon/reagent_containers/food/snacks/old/taco = 2
)
////////////////////weeb_vend (Nippon-tan!) (ADDED 04/11/2021)/////////////////////////////////////////////////
/obj/machinery/vending/weeb
name = "\improper Nippon-tan!"
desc = "A distressingly ethnic vending machine loaded with high sucrose low calorie for lack of better words snacks."
vend_delay = 30
vend_reply = "Dōmo arigatō!"
product_slogans = "Tanoshī! ;Itadakimasu!"
icon_state = "weeb"
products = list(/obj/item/weapon/reagent_containers/food/snacks/weebonuts = 8,
/obj/item/weapon/reagent_containers/food/snacks/ricecake = 8,
/obj/item/weapon/reagent_containers/food/snacks/wasabi_peas = 8,
/obj/item/weapon/reagent_containers/food/snacks/namagashi = 8,
/obj/item/weapon/reagent_containers/food/snacks/hanami_dango = 6,
/obj/item/weapon/reagent_containers/food/snacks/goma_dango = 6,
/obj/item/weapon/storage/box/pocky = 6,
/obj/item/weapon/reagent_containers/food/snacks/chocobanana = 6,
/obj/item/weapon/reagent_containers/food/snacks/dorayaki = 6,
/obj/item/weapon/reagent_containers/food/snacks/daifuku = 6
)
prices = list(/obj/item/weapon/reagent_containers/food/snacks/weebonuts = 5,
/obj/item/weapon/reagent_containers/food/snacks/ricecake = 5,
/obj/item/weapon/reagent_containers/food/snacks/wasabi_peas = 8,
/obj/item/weapon/reagent_containers/food/snacks/namagashi = 8,
/obj/item/weapon/reagent_containers/food/snacks/hanami_dango = 10,
/obj/item/weapon/reagent_containers/food/snacks/goma_dango = 10,
/obj/item/weapon/storage/box/pocky = 8,
/obj/item/weapon/reagent_containers/food/snacks/chocobanana = 10,
/obj/item/weapon/reagent_containers/food/snacks/dorayaki = 5,
/obj/item/weapon/reagent_containers/food/snacks/daifuku = 5
)
////////////////////sol_vend (Mars Mart) (ADDED 04/11/2021)////////////////////////////////////////////////////
/obj/machinery/vending/sol
name = "\improper Sol-Snacks"
desc = "A SolCentric vending machine dispensing a number of Sol-themed snacks, along with other foods."
vend_delay = 30
product_slogans = "A taste of Sol!"
icon_state = "solsnack"
products = list(/obj/item/weapon/reagent_containers/food/snacks/pluto = 8,
/obj/item/weapon/reagent_containers/food/snacks/triton = 8,
/obj/item/weapon/reagent_containers/food/snacks/saturn = 8,
/obj/item/weapon/reagent_containers/food/snacks/jupiter = 8,
/obj/item/weapon/reagent_containers/food/snacks/mars = 8,
/obj/item/weapon/reagent_containers/food/snacks/venus = 8,
/obj/item/weapon/reagent_containers/food/snacks/oort = 8,
/obj/item/weapon/reagent_containers/food/snacks/sun_snax = 8,
/obj/item/weapon/reagent_containers/food/snacks/canned/appleberry = 6,
/obj/item/weapon/storage/box/gum = 8,
/obj/item/weapon/storage/box/admints = 8
)
prices = list( /obj/item/weapon/reagent_containers/food/snacks/pluto = 5,
/obj/item/weapon/reagent_containers/food/snacks/triton = 5,
/obj/item/weapon/reagent_containers/food/snacks/saturn = 5,
/obj/item/weapon/reagent_containers/food/snacks/jupiter = 5,
/obj/item/weapon/reagent_containers/food/snacks/mars = 5,
/obj/item/weapon/reagent_containers/food/snacks/venus = 5,
/obj/item/weapon/reagent_containers/food/snacks/oort = 5,
/obj/item/weapon/reagent_containers/food/snacks/sun_snax = 5,
/obj/item/weapon/reagent_containers/food/snacks/canned/appleberry = 8,
/obj/item/weapon/storage/box/gum = 2,
/obj/item/weapon/storage/box/admints = 2
)
////////////////////snix_vend (Snix!) (ADDED 04/11/2021)////////////////////////////////////////////
//////a food variant of the boda machine - It carries slavic themed foods.. Mostly beer snacks./////
/obj/machinery/vending/snix
name = "\improper Snix"
desc = "A snack vending machine, offering a selection of slavic beer snacks."
vend_delay = 30
product_slogans = "Snix!"
icon_state = "snix"
products = list(/obj/item/weapon/reagent_containers/food/snacks/semki = 8,
/obj/item/weapon/reagent_containers/food/snacks/canned/caviar = 8,
/obj/item/weapon/reagent_containers/food/snacks/squid = 8,
/obj/item/weapon/reagent_containers/food/snacks/croutons = 8,
/obj/item/weapon/reagent_containers/food/snacks/salo = 8,
/obj/item/weapon/reagent_containers/food/snacks/driedfish = 8,
/obj/item/weapon/reagent_containers/food/snacks/pistachios = 8,
/obj/item/weapon/reagent_containers/food/snacks/canned/maps = 4,
/obj/item/weapon/reagent_containers/food/snacks/skrellsnacks = 8,
/obj/item/weapon/storage/box/gum = 8,
/obj/item/weapon/storage/box/admints = 8,
/obj/item/weapon/reagent_containers/food/snacks/pretzels = 8,
/obj/item/weapon/reagent_containers/food/snacks/hakarl = 8
)
contraband = list(/obj/item/weapon/reagent_containers/food/snacks/canned/caviar/true = 1)
prices = list( /obj/item/weapon/reagent_containers/food/snacks/semki = 8,
/obj/item/weapon/reagent_containers/food/snacks/canned/caviar = 8,
/obj/item/weapon/reagent_containers/food/snacks/squid = 8,
/obj/item/weapon/reagent_containers/food/snacks/croutons = 8,
/obj/item/weapon/reagent_containers/food/snacks/salo = 8,
/obj/item/weapon/reagent_containers/food/snacks/driedfish = 8,
/obj/item/weapon/reagent_containers/food/snacks/pistachios = 8,
/obj/item/weapon/reagent_containers/food/snacks/canned/maps = 10,
/obj/item/weapon/reagent_containers/food/snacks/skrellsnacks = 8,
/obj/item/weapon/storage/box/gum = 2,
/obj/item/weapon/storage/box/admints = 2,
/obj/item/weapon/reagent_containers/food/snacks/pretzels = 8,
/obj/item/weapon/reagent_containers/food/snacks/hakarl = 8
)
////////////////////snl_vend (Shop-n-Large Snacks!) (ADDED 04/16/2021)//////////////////////////////
/obj/machinery/vending/snlvend
name = "\improper Shop-n-Large Snacks!"
desc = "A Shop-n-Large brand vending machine! Enjoy all your favorites!"
vend_delay = 30
product_slogans = "Shop Shop-n-Large!, Buy! Buy! Buy!, Try our new Bread Tube! Now with 10% less sawdust!"
icon = 'icons/obj/vending.dmi'
icon_state = "snlvendor"
products = list(/obj/item/weapon/reagent_containers/food/snacks/tuna = 8,
/obj/item/weapon/reagent_containers/food/snacks/semki = 8,
/obj/item/weapon/reagent_containers/food/snacks/pistachios = 8,
/obj/item/weapon/reagent_containers/food/snacks/salo = 8,
/obj/item/weapon/reagent_containers/food/snacks/packaged/spacetwinkie = 8,
/obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers = 8,
/obj/item/weapon/reagent_containers/food/snacks/syndicake = 8,
/obj/item/weapon/reagent_containers/food/snacks/no_raisin = 8,
/obj/item/weapon/reagent_containers/food/snacks/sosjerky = 8,
/obj/item/weapon/reagent_containers/food/snacks/skrellsnacks = 8,
/obj/item/weapon/reagent_containers/food/snacks/tastybread = 8,
/obj/item/weapon/reagent_containers/food/snacks/chips/bbq = 8,
/obj/item/weapon/reagent_containers/food/snacks/chips = 8,
/obj/item/weapon/reagent_containers/food/snacks/driedfish = 8,
/obj/item/weapon/reagent_containers/food/snacks/cookiesnack = 8
)
contraband = list(/obj/item/weapon/reagent_containers/food/snacks/unajerky = 1)
prices = list( /obj/item/weapon/reagent_containers/food/snacks/tuna = 5,
/obj/item/weapon/reagent_containers/food/snacks/semki = 5,
/obj/item/weapon/reagent_containers/food/snacks/pistachios = 5,
/obj/item/weapon/reagent_containers/food/snacks/salo = 5,
/obj/item/weapon/reagent_containers/food/snacks/packaged/spacetwinkie = 5,
/obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers = 5,
/obj/item/weapon/reagent_containers/food/snacks/syndicake = 5,
/obj/item/weapon/reagent_containers/food/snacks/no_raisin = 5,
/obj/item/weapon/reagent_containers/food/snacks/sosjerky = 5,
/obj/item/weapon/reagent_containers/food/snacks/skrellsnacks = 5,
/obj/item/weapon/reagent_containers/food/snacks/tastybread = 5,
/obj/item/weapon/reagent_containers/food/snacks/chips/bbq = 5,
/obj/item/weapon/reagent_containers/food/snacks/chips = 5,
/obj/item/weapon/reagent_containers/food/snacks/driedfish = 5,
/obj/item/weapon/reagent_containers/food/snacks/cookiesnack = 5
)
///////////////////////Soviet Stuff///////////////////////////////////////
/obj/machinery/vending/sovietsoda
name = "BODA"
desc = "An old sweet water vending machine,how did this end up here?"
icon_state = "sovietsoda"
product_ads = "For Tsar and Country.;Have you fulfilled your nutrition quota today?;Very nice!;We are simple people, for this is all we eat.;If there is a person, there is a problem. If there is no person, then there is no problem."
products = list(/obj/item/weapon/reagent_containers/food/drinks/cans/boda = 30, //ADDITION 04/03/2021
/obj/item/weapon/reagent_containers/food/drinks/cans/kompot = 20) //ADDITION 04/03/2021
contraband = list(/obj/item/weapon/reagent_containers/food/drinks/cans/kvass = 20) //ADDITION 04/03/2021
idle_power_usage = 211 //refrigerator - believe it or not, this is actually the average power consumption of a refrigerated vending machine according to NRCan.
vending_sound = "machines/vending/vending_cans.ogg"
/obj/machinery/vending/sovietvend //ADDITION 04/20/2021
name = "Ration Station"
desc = "An old ration vendor unit. How it even still functional?"
icon = 'icons/obj/vending.dmi'
icon_state = "sovietvend"
product_ads = "For Tsar and Country.;Have you fulfilled your nutrition quota today?;Very nice!;We are simple people, for this is all we eat.;If there is a person, there is a problem. If there is no person, then there is no problem."
products = list(/obj/item/weapon/reagent_containers/food/snacks/packaged/genration = 8,
/obj/item/weapon/reagent_containers/food/snacks/packaged/vegration = 8,
/obj/item/weapon/reagent_containers/food/snacks/packaged/meatration = 8)
contraband = list(/obj/item/weapon/reagent_containers/food/snacks/packaged/sweetration = 2)
+1 -1
View File
@@ -19,7 +19,7 @@ var/list/lunchables_snacks_ = list(/obj/item/weapon/reagent_containers/food/snac
/obj/item/weapon/reagent_containers/food/snacks/sosjerky,
/obj/item/weapon/reagent_containers/food/snacks/unajerky,
/obj/item/weapon/reagent_containers/food/snacks/no_raisin,
/obj/item/weapon/reagent_containers/food/snacks/spacetwinkie,
/obj/item/weapon/reagent_containers/food/snacks/packaged/spacetwinkie,
/obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers,
/obj/item/weapon/reagent_containers/food/snacks/poppypretzel,
/obj/item/weapon/reagent_containers/food/snacks/carrotfries,
File diff suppressed because it is too large Load Diff
Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 161 KiB

After

Width:  |  Height:  |  Size: 165 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.6 KiB

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 33 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 375 KiB

After

Width:  |  Height:  |  Size: 389 KiB

@@ -4,8 +4,8 @@
"ad" = (/turf/simulated/shuttle/wall,/area/submap/cave/qShuttle)
"ae" = (/obj/structure/inflatable,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/qShuttle)
"af" = (/obj/structure/inflatable/door,/turf/simulated/mineral/floor/ignore_mapgen,/area/submap/cave/qShuttle)
"ag" = (/obj/structure/shuttle/engine/heater{icon_state = "heater"; dir = 4},/turf/simulated/shuttle/plating,/area/submap/cave/qShuttle)
"ah" = (/obj/structure/shuttle/engine/propulsion{icon_state = "propulsion_l"; dir = 8},/turf/simulated/shuttle/plating,/area/submap/cave/qShuttle)
"ag" = (/obj/structure/shuttle/engine/heater{dir = 4; icon_state = "heater"},/turf/simulated/shuttle/plating,/area/submap/cave/qShuttle)
"ah" = (/obj/structure/shuttle/engine/propulsion{dir = 8; icon_state = "propulsion_l"},/turf/simulated/shuttle/plating,/area/submap/cave/qShuttle)
"ai" = (/obj/structure/grille,/obj/structure/shuttle/window,/obj/machinery/door/blast/regular{dir = 8; id = "QShuttlePoIDoors"; layer = 3.3; name = "Emergency Lockdown Shutters"},/obj/item/tape/medical{dir = 4; icon_state = "tape_door_0"; layer = 3.4},/turf/simulated/shuttle/plating,/area/submap/cave/qShuttle)
"aj" = (/turf/simulated/shuttle/wall/hard_corner,/area/submap/cave/qShuttle)
"ak" = (/obj/machinery/door/airlock/external{desc = "It opens and closes. It is stamped with the logo of Major Bill's Transportation"; frequency = 1380; icon_state = "door_locked"; id_tag = null; locked = 1; name = "MBT-540"},/obj/item/tape/medical{dir = 4; icon_state = "tape_door_0"; layer = 3.4},/turf/simulated/shuttle/floor{icon_state = "floor_white"},/area/submap/cave/qShuttle)
@@ -16,7 +16,7 @@
"ap" = (/obj/effect/decal/remains/human,/obj/item/clothing/suit/space/emergency,/obj/item/clothing/head/helmet/space/emergency,/turf/simulated/shuttle/floor{icon_state = "floor_white"},/area/submap/cave/qShuttle)
"aq" = (/obj/structure/bed/chair,/turf/simulated/shuttle/floor{icon_state = "floor_white"},/area/submap/cave/qShuttle)
"ar" = (/obj/structure/bed/chair,/obj/effect/decal/remains/human,/obj/item/clothing/suit/space/emergency,/turf/simulated/shuttle/floor{icon_state = "floor_white"},/area/submap/cave/qShuttle)
"as" = (/obj/machinery/vending/snack{contraband = null; products = list(/obj/item/weapon/reagent_containers/food/snacks/candy = 0, /obj/item/weapon/reagent_containers/food/drinks/dry_ramen = 0, /obj/item/weapon/reagent_containers/food/snacks/chips = 0, /obj/item/weapon/reagent_containers/food/snacks/sosjerky = 0, /obj/item/weapon/reagent_containers/food/snacks/no_raisin = 0, /obj/item/weapon/reagent_containers/food/snacks/spacetwinkie = 0, /obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers = 0, /obj/item/weapon/reagent_containers/food/snacks/tastybread = 0, /obj/item/weapon/reagent_containers/food/snacks/skrellsnacks = 0)},/turf/simulated/shuttle/floor{icon_state = "floor_white"},/area/submap/cave/qShuttle)
"as" = (/obj/machinery/vending/snack{contraband = null; products = list(/obj/item/weapon/reagent_containers/food/snacks/candy = 0, /obj/item/weapon/reagent_containers/food/drinks/dry_ramen = 0, /obj/item/weapon/reagent_containers/food/snacks/chips = 0, /obj/item/weapon/reagent_containers/food/snacks/sosjerky = 0, /obj/item/weapon/reagent_containers/food/snacks/no_raisin = 0, /obj/item/weapon/reagent_containers/food/snacks/packaged/spacetwinkie = 0, /obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers = 0, /obj/item/weapon/reagent_containers/food/snacks/tastybread = 0, /obj/item/weapon/reagent_containers/food/snacks/skrellsnacks = 0)},/turf/simulated/shuttle/floor{icon_state = "floor_white"},/area/submap/cave/qShuttle)
"at" = (/obj/machinery/vending/cola{contraband = null; products = list(/obj/item/weapon/reagent_containers/food/drinks/cans/cola = 0, /obj/item/weapon/reagent_containers/food/drinks/cans/space_mountain_wind = 0, /obj/item/weapon/reagent_containers/food/drinks/cans/dr_gibb = 0, /obj/item/weapon/reagent_containers/food/drinks/cans/starkist = 0, /obj/item/weapon/reagent_containers/food/drinks/cans/waterbottle = 0, /obj/item/weapon/reagent_containers/food/drinks/cans/space_up = 0, /obj/item/weapon/reagent_containers/food/drinks/cans/iced_tea = 0, /obj/item/weapon/reagent_containers/food/drinks/cans/grape_juice = 0, /obj/item/weapon/reagent_containers/food/drinks/cans/gingerale = 0)},/turf/simulated/shuttle/floor{icon_state = "floor_white"},/area/submap/cave/qShuttle)
"au" = (/obj/structure/closet/crate/secure/loot,/turf/simulated/shuttle/floor{icon_state = "floor_yellow"},/area/submap/cave/qShuttle)
"av" = (/obj/item/weapon/pickaxe/drill,/turf/simulated/shuttle/floor{icon_state = "floor_yellow"},/area/submap/cave/qShuttle)
+3
View File
@@ -0,0 +1,3 @@
[LocalizedFileNames]
tincanopen.ogg=@tincanopen,0
packagedfoodopen.ogg=@packagedfoodopen,0
Binary file not shown.
Binary file not shown.
+5
View File
@@ -1720,9 +1720,14 @@
#include "code\modules\ai\ai_holder_targeting_vr.dm"
#include "code\modules\ai\interfaces.dm"
#include "code\modules\ai\say_list.dm"
<<<<<<< HEAD:vorestation.dme
#include "code\modules\ai\ai_holder_subtypes\simple_mob_ai.dm"
#include "code\modules\ai\ai_holder_subtypes\simple_mob_ai_vr.dm"
#include "code\modules\ai\ai_holder_subtypes\slime_xenobio_ai.dm"
=======
#include "code\modules\ai\aI_holder_subtypes\simple_mob_ai.dm"
#include "code\modules\ai\aI_holder_subtypes\slime_xenobio_ai.dm"
>>>>>>> 1c7d9c4... Food 4 thought (#8083):polaris.dme
#include "code\modules\alarm\alarm.dm"
#include "code\modules\alarm\alarm_handler.dm"
#include "code\modules\alarm\atmosphere_alarm.dm"