shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixes

Browse Source 
- fixed airlock directions and gato-ified festivestation a bit
- fixed some presets of comfy chairs
- nerfed mealdors
This commit is contained in:
evilew
2024-11-22 05:02:56 +01:00
parent f1cef34b8c
commit 167717ee37
3 changed files with 1804 additions and 1850 deletions
Download Patch File Download Diff File Expand all files Collapse all files
GainStation13/code/modules/vending/mealdor.dm
+12 -23
View File
@@ -7,35 +7,24 @@
vend_reply = "Enjoy your meal."
products = list(
/obj/item/reagent_containers/food/snacks/store/cake/cheese = 10,
/obj/item/reagent_containers/food/snacks/store/cake/pumpkinspice = 10,
/obj/item/reagent_containers/food/snacks/store/cake/pound_cake = 8,
/obj/item/reagent_containers/food/snacks/cakeslice/bsvc = 5,
/obj/item/reagent_containers/food/snacks/cakeslice/bscc = 5,
// /obj/item/reagent_containers/food/snacks/donut/purefat = 10,
/obj/item/reagent_containers/food/snacks/fries = 10,
/obj/item/reagent_containers/food/snacks/donut = 20,
/obj/item/reagent_containers/food/snacks/candiedapple = 7,
/obj/item/reagent_containers/food/snacks/fries = 4,
/obj/item/reagent_containers/food/snacks/donut = 10,
/obj/item/reagent_containers/food/snacks/burrito = 8,
/obj/item/reagent_containers/food/snacks/enchiladas = 10,
/obj/item/reagent_containers/food/snacks/spaghetti = 20,
/obj/item/reagent_containers/food/snacks/kebab/rat = 7,
/obj/item/reagent_containers/food/snacks/kebab/rat/double = 6,
/obj/item/reagent_containers/food/snacks/meatballspaghetti = 10,
/obj/item/reagent_containers/food/snacks/pizza/margherita = 4,
/obj/item/reagent_containers/food/snacks/butterdog = 5,
/obj/item/reagent_containers/food/snacks/burger/plain = 5,
/obj/item/reagent_containers/food/snacks/pie/plump_pie = 4,
/obj/item/reagent_containers/food/snacks/store/cake/cheese = 2,
/obj/item/reagent_containers/food/snacks/store/cake/pumpkinspice = 2,
/obj/item/reagent_containers/food/snacks/store/cake/pound_cake = 2,
/obj/item/reagent_containers/food/snacks/cakeslice/bsvc = 3,
/obj/item/reagent_containers/food/snacks/cakeslice/bscc = 3,
/obj/item/reagent_containers/food/drinks/bottle/orangejuice = 10,
/obj/item/reagent_containers/food/drinks/bottle/pineapplejuice = 10,
/obj/item/reagent_containers/food/drinks/bottle/strawberryjuice = 10,
/obj/item/reagent_containers/food/drinks/beer = 10,
/obj/item/reagent_containers/food/drinks/soda_cans/cola = 10,
/obj/item/reagent_containers/food/snacks/pizza/margherita = 10,
/obj/item/reagent_containers/food/snacks/butterdog = 12,
/obj/item/reagent_containers/food/snacks/burger/plain = 20,
/obj/item/reagent_containers/food/snacks/burger/bearger = 10,
/obj/item/reagent_containers/food/snacks/pie/plump_pie = 8,
/obj/item/reagent_containers/food/snacks/dough = 20
/obj/item/reagent_containers/food/snacks/dough = 10
)
contraband = list(
/obj/item/clothing/mask/fakemoustache = 5,
/obj/item/clothing/head/chefhat = 5,
/obj/item/reagent_containers/food/snacks/cookie = 10,
/obj/item/reagent_containers/food/snacks/salad/fruit = 15,
_maps/map_files/FestiveBall/FestiveStation.dmm
+1786 -1827
View File
File diff suppressed because it is too large Load Diff
code/game/objects/structures/beds_chairs/chair.dm
+6
View File
@@ -256,6 +256,12 @@
/obj/structure/chair/comfy/blue //GS13 - better comfy chairs
paddingcolor = rgb(125, 137, 218)
/obj/structure/chair/comfy/green //GS13 - better comfy chairs
paddingcolor = rgb(102, 137, 81)
/obj/structure/chair/comfy/purple //GS13 - better comfy chairs
paddingcolor = rgb(130, 86, 171)
/obj/structure/chair/comfy/plywood
name = "plywood chair"
desc = "A relaxing plywood chair."