cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes sliceable food and slices

Browse Source
This commit is contained in:
Yoshax
2017-03-10 19:49:15 +00:00
parent 6f12826c45
commit 3a31c88f43
4 changed files with 268 additions and 310 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
code/modules/economy/price_list.dm
View File

@@ -705,16 +705,16 @@
/obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza /obj/item/weapon/reagent_containers/food/snacks/sliceable/pizza
price_tag = 5 price_tag = 5
/obj/item/weapon/reagent_containers/food/snacks/margheritaslice /obj/item/weapon/reagent_containers/food/snacks/slice/margherita
price_tag = 1 price_tag = 1
/obj/item/weapon/reagent_containers/food/snacks/meatpizzaslice /obj/item/weapon/reagent_containers/food/snacks/slice/meatpizza
price_tag = 1 price_tag = 1
/obj/item/weapon/reagent_containers/food/snacks/mushroompizzaslice /obj/item/weapon/reagent_containers/food/snacks/slice/mushroompizza
price_tag = 1 price_tag = 1
/obj/item/weapon/reagent_containers/food/snacks/vegetablepizzaslice /obj/item/weapon/reagent_containers/food/snacks/slice/vegetablepizza
price_tag = 1 price_tag = 1
/obj/item/weapon/reagent_containers/food/snacks/ /obj/item/weapon/reagent_containers/food/snacks/
@@ -737,37 +737,37 @@
/obj/item/weapon/reagent_containers/food/snacks/sliceable/meatbread /obj/item/weapon/reagent_containers/food/snacks/sliceable/meatbread
price_tag = 5 price_tag = 5
/obj/item/weapon/reagent_containers/food/snacks/meatbreadslice /obj/item/weapon/reagent_containers/food/snacks/slice/meatbread
price_tag = 1 price_tag = 1
/obj/item/weapon/reagent_containers/food/snacks/sliceable/xenomeatbread /obj/item/weapon/reagent_containers/food/snacks/sliceable/xenomeatbread
price_tag = 5 price_tag = 5
/obj/item/weapon/reagent_containers/food/snacks/xenomeatbreadslice /obj/item/weapon/reagent_containers/food/snacks/slice/xenomeatbread
price_tag = 1 price_tag = 1
/obj/item/weapon/reagent_containers/food/snacks/sliceable/bananabread /obj/item/weapon/reagent_containers/food/snacks/sliceable/bananabread
price_tag = 5 price_tag = 5
/obj/item/weapon/reagent_containers/food/snacks/bananabreadslice /obj/item/weapon/reagent_containers/food/snacks/slice/bananabread
price_tag = 1 price_tag = 1
/obj/item/weapon/reagent_containers/food/snacks/sliceable/tofubread /obj/item/weapon/reagent_containers/food/snacks/sliceable/tofubread
price_tag = 5 price_tag = 5
/obj/item/weapon/reagent_containers/food/snacks/tofubreadslice /obj/item/weapon/reagent_containers/food/snacks/slice/tofubread
price_tag = 1 price_tag = 1
/obj/item/weapon/reagent_containers/food/snacks/sliceable/bread /obj/item/weapon/reagent_containers/food/snacks/sliceable/bread
price_tag = 5 price_tag = 5
/obj/item/weapon/reagent_containers/food/snacks/breadslice /obj/item/weapon/reagent_containers/food/snacks/slice/bread
price_tag = 1 price_tag = 1
/obj/item/weapon/reagent_containers/food/snacks/sliceable/creamcheesebread /obj/item/weapon/reagent_containers/food/snacks/sliceable/creamcheesebread
price_tag = 5 price_tag = 5
/obj/item/weapon/reagent_containers/food/snacks/creamcheesebreadslice /obj/item/weapon/reagent_containers/food/snacks/slice/creamcheesebread
price_tag = 1 price_tag = 1
@@ -845,67 +845,67 @@
/obj/item/weapon/reagent_containers/food/snacks/sliceable/carrotcake /obj/item/weapon/reagent_containers/food/snacks/sliceable/carrotcake
price_tag = 5 price_tag = 5
/obj/item/weapon/reagent_containers/food/snacks/carrotcakeslice /obj/item/weapon/reagent_containers/food/snacks/slice/carrotcake
price_tag = 1 price_tag = 1
/obj/item/weapon/reagent_containers/food/snacks/sliceable/braincake /obj/item/weapon/reagent_containers/food/snacks/sliceable/braincake
price_tag = 5 price_tag = 5
/obj/item/weapon/reagent_containers/food/snacks/braincakeslice /obj/item/weapon/reagent_containers/food/snacks/slice/braincake
price_tag = 1 price_tag = 1
/obj/item/weapon/reagent_containers/food/snacks/sliceable/cheesecake /obj/item/weapon/reagent_containers/food/snacks/sliceable/cheesecake
price_tag = 5 price_tag = 5
/obj/item/weapon/reagent_containers/food/snacks/cheesecakeslice /obj/item/weapon/reagent_containers/food/snacks/slice/cheesecake
price_tag = 1 price_tag = 1
/obj/item/weapon/reagent_containers/food/snacks/sliceable/plaincake /obj/item/weapon/reagent_containers/food/snacks/sliceable/plaincake
price_tag = 5 price_tag = 5
/obj/item/weapon/reagent_containers/food/snacks/plaincakeslice /obj/item/weapon/reagent_containers/food/snacks/slice/plaincake
price_tag = 1 price_tag = 1
/obj/item/weapon/reagent_containers/food/snacks/sliceable/orangecake /obj/item/weapon/reagent_containers/food/snacks/sliceable/orangecake
price_tag = 5 price_tag = 5
/obj/item/weapon/reagent_containers/food/snacks/orangecakeslice /obj/item/weapon/reagent_containers/food/snacks/slice/orangecake
price_tag = 1 price_tag = 1
/obj/item/weapon/reagent_containers/food/snacks/sliceable/limecake /obj/item/weapon/reagent_containers/food/snacks/sliceable/limecake
price_tag = 5 price_tag = 5
/obj/item/weapon/reagent_containers/food/snacks/limecakeslice /obj/item/weapon/reagent_containers/food/snacks/slice/limecake
price_tag = 1 price_tag = 1
/obj/item/weapon/reagent_containers/food/snacks/sliceable/lemoncake /obj/item/weapon/reagent_containers/food/snacks/sliceable/lemoncake
price_tag = 5 price_tag = 5
/obj/item/weapon/reagent_containers/food/snacks/lemoncakeslice /obj/item/weapon/reagent_containers/food/snacks/slice/lemoncake
price_tag = 1 price_tag = 1
/obj/item/weapon/reagent_containers/food/snacks/sliceable/chocolatecake /obj/item/weapon/reagent_containers/food/snacks/sliceable/chocolatecake
price_tag = 5 price_tag = 5
/obj/item/weapon/reagent_containers/food/snacks/chocolatecakeslice /obj/item/weapon/reagent_containers/food/snacks/slice/chocolatecake
price_tag = 1 price_tag = 1
/obj/item/weapon/reagent_containers/food/snacks/sliceable/birthdaycake /obj/item/weapon/reagent_containers/food/snacks/sliceable/birthdaycake
price_tag = 5 price_tag = 5
/obj/item/weapon/reagent_containers/food/snacks/birthdaycakeslice /obj/item/weapon/reagent_containers/food/snacks/slice/birthdaycake
price_tag = 1 price_tag = 1
/obj/item/weapon/reagent_containers/food/snacks/sliceable/applecake /obj/item/weapon/reagent_containers/food/snacks/sliceable/applecake
price_tag = 5 price_tag = 5
/obj/item/weapon/reagent_containers/food/snacks/applecakeslice /obj/item/weapon/reagent_containers/food/snacks/slice/applecake
price_tag = 1 price_tag = 1
/obj/item/weapon/reagent_containers/food/snacks/sliceable/pumpkinpie /obj/item/weapon/reagent_containers/food/snacks/sliceable/pumpkinpie
price_tag = 5 price_tag = 5
/obj/item/weapon/reagent_containers/food/snacks/pumpkinpieslice /obj/item/weapon/reagent_containers/food/snacks/slice/pumpkinpie
price_tag = 1 price_tag = 1

34
code/modules/reagents/reagent_containers/food/lunch.dm
View File

@@ -1,11 +1,11 @@
var/list/lunchables_lunches_ = list(/obj/item/weapon/reagent_containers/food/snacks/sandwich, var/list/lunchables_lunches_ = list(/obj/item/weapon/reagent_containers/food/snacks/sandwich,
/obj/item/weapon/reagent_containers/food/snacks/meatbreadslice, /obj/item/weapon/reagent_containers/food/snacks/slice/meatbread/filled,
/obj/item/weapon/reagent_containers/food/snacks/tofubreadslice, /obj/item/weapon/reagent_containers/food/snacks/slice/tofubread/filled,
/obj/item/weapon/reagent_containers/food/snacks/creamcheesebreadslice, /obj/item/weapon/reagent_containers/food/snacks/slice/creamcheesebread/filled,
/obj/item/weapon/reagent_containers/food/snacks/margheritaslice, /obj/item/weapon/reagent_containers/food/snacks/slice/margherita/filled,
/obj/item/weapon/reagent_containers/food/snacks/meatpizzaslice, /obj/item/weapon/reagent_containers/food/snacks/slice/meatpizza/filled,
/obj/item/weapon/reagent_containers/food/snacks/mushroompizzaslice, /obj/item/weapon/reagent_containers/food/snacks/slice/mushroompizza/filled,
/obj/item/weapon/reagent_containers/food/snacks/vegetablepizzaslice, /obj/item/weapon/reagent_containers/food/snacks/slice/vegetablepizza/filled,
/obj/item/weapon/reagent_containers/food/snacks/tastybread, /obj/item/weapon/reagent_containers/food/snacks/tastybread,
/obj/item/weapon/reagent_containers/food/snacks/liquidfood, /obj/item/weapon/reagent_containers/food/snacks/liquidfood,
/obj/item/weapon/reagent_containers/food/snacks/jellysandwich/cherry, /obj/item/weapon/reagent_containers/food/snacks/jellysandwich/cherry,
@@ -26,17 +26,17 @@ var/list/lunchables_snacks_ = list(/obj/item/weapon/reagent_containers/food/snac
/obj/item/weapon/reagent_containers/food/snacks/cherrypie, /obj/item/weapon/reagent_containers/food/snacks/cherrypie,
/obj/item/weapon/reagent_containers/food/snacks/plumphelmetbiscuit, /obj/item/weapon/reagent_containers/food/snacks/plumphelmetbiscuit,
/obj/item/weapon/reagent_containers/food/snacks/appletart, /obj/item/weapon/reagent_containers/food/snacks/appletart,
/obj/item/weapon/reagent_containers/food/snacks/carrotcakeslice, /obj/item/weapon/reagent_containers/food/snacks/slice/carrotcake/filled,
/obj/item/weapon/reagent_containers/food/snacks/cheesecakeslice, /obj/item/weapon/reagent_containers/food/snacks/slice/cheesecake/filled,
/obj/item/weapon/reagent_containers/food/snacks/plaincakeslice, /obj/item/weapon/reagent_containers/food/snacks/slice/plaincake/filled,
/obj/item/weapon/reagent_containers/food/snacks/orangecakeslice, /obj/item/weapon/reagent_containers/food/snacks/slice/orangecake/filled,
/obj/item/weapon/reagent_containers/food/snacks/limecakeslice, /obj/item/weapon/reagent_containers/food/snacks/slice/limecake/filled,
/obj/item/weapon/reagent_containers/food/snacks/lemoncakeslice, /obj/item/weapon/reagent_containers/food/snacks/slice/lemoncake/filled,
/obj/item/weapon/reagent_containers/food/snacks/chocolatecakeslice, /obj/item/weapon/reagent_containers/food/snacks/slice/chocolatecake/filled,
/obj/item/weapon/reagent_containers/food/snacks/birthdaycakeslice, /obj/item/weapon/reagent_containers/food/snacks/slice/birthdaycake/filled,
/obj/item/weapon/reagent_containers/food/snacks/watermelonslice, /obj/item/weapon/reagent_containers/food/snacks/watermelonslice,
/obj/item/weapon/reagent_containers/food/snacks/applecakeslice, /obj/item/weapon/reagent_containers/food/snacks/slice/applecake/filled,
/obj/item/weapon/reagent_containers/food/snacks/pumpkinpieslice, /obj/item/weapon/reagent_containers/food/snacks/slice/pumpkinpie/filled,
/obj/item/weapon/reagent_containers/food/snacks/skrellsnacks) /obj/item/weapon/reagent_containers/food/snacks/skrellsnacks)
var/list/lunchables_drinks_ = list(/obj/item/weapon/reagent_containers/food/drinks/cans/cola, var/list/lunchables_drinks_ = list(/obj/item/weapon/reagent_containers/food/drinks/cans/cola,

498
code/modules/reagents/reagent_containers/food/snacks.dm
View File

File diff suppressed because it is too large Load Diff

4
maps/northern_star/polaris-2.dmm
View File

@@ -1931,7 +1931,7 @@
"aLg" = (/obj/structure/table/woodentable{dir = 5},/obj/item/weapon/reagent_containers/food/snacks/amanita_pie,/turf/unsimulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/centcom/bar) "aLg" = (/obj/structure/table/woodentable{dir = 5},/obj/item/weapon/reagent_containers/food/snacks/amanita_pie,/turf/unsimulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/centcom/bar)
"aLh" = (/obj/structure/table/woodentable{dir = 5},/obj/item/weapon/reagent_containers/food/snacks/bigbiteburger,/turf/unsimulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/centcom/bar) "aLh" = (/obj/structure/table/woodentable{dir = 5},/obj/item/weapon/reagent_containers/food/snacks/bigbiteburger,/turf/unsimulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/centcom/bar)
"aLi" = (/obj/structure/bed/chair/wood/wings{icon_state = "wooden_chair_wings"; dir = 8},/turf/unsimulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/centcom/bar) "aLi" = (/obj/structure/bed/chair/wood/wings{icon_state = "wooden_chair_wings"; dir = 8},/turf/unsimulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/centcom/bar)
"aLj" = (/obj/structure/table/woodentable{dir = 5},/obj/item/weapon/reagent_containers/food/snacks/carrotcakeslice,/turf/unsimulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/centcom/bar) "aLj" = (/obj/structure/table/woodentable{dir = 5},/obj/item/weapon/reagent_containers/food/snacks/slice/carrotcake/filled,/turf/unsimulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/centcom/bar)
"aLk" = (/obj/structure/table/woodentable{dir = 5},/obj/item/weapon/reagent_containers/food/snacks/stew,/turf/unsimulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/centcom/bar) "aLk" = (/obj/structure/table/woodentable{dir = 5},/obj/item/weapon/reagent_containers/food/snacks/stew,/turf/unsimulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/centcom/bar)
"aLl" = (/obj/item/weapon/stool/padded,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/bathroom) "aLl" = (/obj/item/weapon/stool/padded,/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/bathroom)
"aLm" = (/obj/structure/window/shuttle,/obj/structure/grille,/turf/simulated/shuttle/plating,/area/shuttle/escape/centcom) "aLm" = (/obj/structure/window/shuttle,/obj/structure/grille,/turf/simulated/shuttle/plating,/area/shuttle/escape/centcom)
@@ -1975,7 +1975,7 @@
"aLY" = (/obj/structure/table/woodentable{dir = 5},/obj/item/weapon/reagent_containers/food/snacks/bloodsoup,/turf/unsimulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/centcom/bar) "aLY" = (/obj/structure/table/woodentable{dir = 5},/obj/item/weapon/reagent_containers/food/snacks/bloodsoup,/turf/unsimulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/centcom/bar)
"aLZ" = (/obj/structure/table/woodentable{dir = 5},/obj/item/weapon/reagent_containers/food/snacks/tofukabob,/turf/unsimulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/centcom/bar) "aLZ" = (/obj/structure/table/woodentable{dir = 5},/obj/item/weapon/reagent_containers/food/snacks/tofukabob,/turf/unsimulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/centcom/bar)
"aMa" = (/obj/structure/table/woodentable{dir = 5},/obj/item/weapon/reagent_containers/food/snacks/poppypretzel,/turf/unsimulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/centcom/bar) "aMa" = (/obj/structure/table/woodentable{dir = 5},/obj/item/weapon/reagent_containers/food/snacks/poppypretzel,/turf/unsimulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/centcom/bar)
"aMb" = (/obj/structure/table/woodentable{dir = 5},/obj/item/weapon/reagent_containers/food/snacks/orangecakeslice,/turf/unsimulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/centcom/bar) "aMb" = (/obj/structure/table/woodentable{dir = 5},/obj/item/weapon/reagent_containers/food/snacks/slice/orangecake/filled,/turf/unsimulated/floor{tag = "icon-wood"; icon_state = "wood"},/area/centcom/bar)
"aMc" = (/obj/machinery/atm{pixel_x = -30},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/main_hall) "aMc" = (/obj/machinery/atm{pixel_x = -30},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/main_hall)
"aMd" = (/obj/machinery/atm{pixel_x = 30},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/main_hall) "aMd" = (/obj/machinery/atm{pixel_x = 30},/turf/unsimulated/floor{icon_state = "steel"},/area/centcom/main_hall)
"aMe" = (/obj/structure/bed/chair{dir = 4},/obj/machinery/light/small{dir = 1},/turf/simulated/shuttle/floor4,/area/shuttle/escape/centcom) "aMe" = (/obj/structure/bed/chair{dir = 4},/obj/machinery/light/small{dir = 1},/turf/simulated/shuttle/floor4,/area/shuttle/escape/centcom)