cyberpresidentvanellope/GS13
1
0
Fork 0
mirror of https://github.com/KabKebab/GS13.git synced 2026-07-10 15:36:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1013 from DragonTrance/food-tray

Browse Source 
Food Trays hold more and fixes Donk Pocket Boxes
This commit is contained in:
QuoteFox
2021-03-05 13:22:36 +00:00
committed by GitHub
parent 08e55a3f4f a336b3086f
commit a16c5652c9
3 changed files with 37 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/storage/bags.dm
+20 -1
View File
@@ -307,7 +307,23 @@
/obj/item/storage/bag/tray/ComponentInitialize()
. = ..()
var/datum/component/storage/STR = GetComponent(/datum/component/storage)
STR.max_items = 15 //I want my sushi god damn it
STR.insert_preposition = "on"
STR.can_hold = typecacheof(list(
/obj/item/reagent_containers/food,
/obj/item/kitchen,
/obj/item/storage/box/donkpockets))
/obj/item/storage/bag/tray/pre_attack(atom/A, mob/living/user, params)
if(istype(A, /obj/structure/table) && user.a_intent == INTENT_HELP) //I want my tray god damn it
if(user.transferItemToLoc(src, get_turf(A)))
var/list/click_params = params2list(params)
if(!click_params || !click_params["icon-x"] || !click_params["icon-y"])
return
pixel_x = CLAMP(text2num(click_params["icon-x"]) - 16, -(world.icon_size/2), world.icon_size/2)
pixel_y = CLAMP(text2num(click_params["icon-y"]) - 16, -(world.icon_size/2), world.icon_size/2)
return
..()
/obj/item/storage/bag/tray/attack(mob/living/M, mob/living/user)
. = ..()
@@ -336,7 +352,10 @@
/obj/item/storage/bag/tray/update_icon()
cut_overlays()
for(var/obj/item/I in contents)
add_overlay(new /mutable_appearance(I))
var/mutable_appearance/MA = new (I) //I want my icons god damn it
MA.pixel_x = rand(-6, 6)
MA.pixel_y = rand(-6, 6)
add_overlay(MA)
/obj/item/storage/bag/tray/Entered()
. = ..()
code/game/objects/items/storage/boxes.dm
+16 -62
View File
@@ -416,99 +416,53 @@
icon_state = "donkpocketbox"
illustration=null
price = 10
var/donktype = /obj/item/reagent_containers/food/snacks/donkpocket
var/warmtype = /obj/item/reagent_containers/food/snacks/donkpocket/warm
/obj/item/storage/box/donkpockets/ComponentInitialize()
. = ..()
var/datum/component/storage/STR = GetComponent(/datum/component/storage)
STR.can_hold = typecacheof(list(/obj/item/reagent_containers/food/snacks/donkpocket))
STR.can_hold = typecacheof(list(donktype, warmtype), TRUE)
/obj/item/storage/box/donkpockets/PopulateContents()
for(var/i in 1 to 6)
new /obj/item/reagent_containers/food/snacks/donkpocket(src)
new donktype(src)
/obj/item/storage/box/donkpockets/donkpocketspicy
name = "box of spicy-flavoured donk-pockets"
icon_state = "donkpocketboxspicy"
var/donktype = /obj/item/reagent_containers/food/snacks/donkpocket/spicy
/obj/item/storage/box/donkpockets/donkpocketspicy/ComponentInitialize()
. = ..()
var/datum/component/storage/STR = GetComponent(/datum/component/storage)
STR.can_hold = typecacheof(list(/obj/item/reagent_containers/food/snacks/donkpocket/spicy))
/obj/item/storage/box/donkpockets/donkpocketspicy/PopulateContents()
for(var/i in 1 to 6)
new /obj/item/reagent_containers/food/snacks/donkpocket/spicy(src)
donktype = /obj/item/reagent_containers/food/snacks/donkpocket/spicy
warmtype = /obj/item/reagent_containers/food/snacks/donkpocket/warm/spicy
/obj/item/storage/box/donkpockets/donkpocketteriyaki
name = "box of teriyaki-flavoured donk-pockets"
icon_state = "donkpocketboxteriyaki"
var/donktype = /obj/item/reagent_containers/food/snacks/donkpocket/teriyaki
/obj/item/storage/box/donkpockets/donkpocketteriyaki/ComponentInitialize()
. = ..()
var/datum/component/storage/STR = GetComponent(/datum/component/storage)
STR.can_hold = typecacheof(list(/obj/item/reagent_containers/food/snacks/donkpocket/teriyaki))
/obj/item/storage/box/donkpockets/donkpocketteriyaki/PopulateContents()
for(var/i in 1 to 6)
new /obj/item/reagent_containers/food/snacks/donkpocket/teriyaki(src)
donktype = /obj/item/reagent_containers/food/snacks/donkpocket/teriyaki
warmtype = /obj/item/reagent_containers/food/snacks/donkpocket/warm/teriyaki
/obj/item/storage/box/donkpockets/donkpocketpizza
name = "box of pizza-flavoured donk-pockets"
icon_state = "donkpocketboxpizza"
var/donktype = /obj/item/reagent_containers/food/snacks/donkpocket/pizza
/obj/item/storage/box/donkpockets/donkpocketpizza/ComponentInitialize()
. = ..()
var/datum/component/storage/STR = GetComponent(/datum/component/storage)
STR.can_hold = typecacheof(list(/obj/item/reagent_containers/food/snacks/donkpocket/pizza))
/obj/item/storage/box/donkpockets/donkpocketpizza/PopulateContents()
for(var/i in 1 to 6)
new /obj/item/reagent_containers/food/snacks/donkpocket/pizza(src)
donktype = /obj/item/reagent_containers/food/snacks/donkpocket/pizza
warmtype = /obj/item/reagent_containers/food/snacks/donkpocket/warm/pizza
/obj/item/storage/box/donkpockets/donkpocketgondola
name = "box of gondola-flavoured donk-pockets"
icon_state = "donkpocketboxgondola"
var/donktype = /obj/item/reagent_containers/food/snacks/donkpocket/gondola
/obj/item/storage/box/donkpockets/donkpocketgondola/ComponentInitialize()
. = ..()
var/datum/component/storage/STR = GetComponent(/datum/component/storage)
STR.can_hold = typecacheof(list(/obj/item/reagent_containers/food/snacks/donkpocket/gondola))
/obj/item/storage/box/donkpockets/donkpocketgondola/PopulateContents()
for(var/i in 1 to 6)
new /obj/item/reagent_containers/food/snacks/donkpocket/gondola(src)
donktype = /obj/item/reagent_containers/food/snacks/donkpocket/gondola
warmtype = /obj/item/reagent_containers/food/snacks/donkpocket/warm/gondola
/obj/item/storage/box/donkpockets/donkpocketberry
name = "box of berry-flavoured donk-pockets"
icon_state = "donkpocketboxberry"
var/donktype = /obj/item/reagent_containers/food/snacks/donkpocket/berry
/obj/item/storage/box/donkpockets/donkpocketberry/ComponentInitialize()
. = ..()
var/datum/component/storage/STR = GetComponent(/datum/component/storage)
STR.can_hold = typecacheof(list(/obj/item/reagent_containers/food/snacks/donkpocket/berry))
/obj/item/storage/box/donkpockets/donkpocketberry/PopulateContents()
for(var/i in 1 to 6)
new /obj/item/reagent_containers/food/snacks/donkpocket/berry(src)
donktype = /obj/item/reagent_containers/food/snacks/donkpocket/berry
warmtype = /obj/item/reagent_containers/food/snacks/donkpocket/warm/berry
/obj/item/storage/box/donkpockets/donkpockethonk
name = "box of banana-flavoured donk-pockets"
icon_state = "donkpocketboxbanana"
var/donktype = /obj/item/reagent_containers/food/snacks/donkpocket/honk
/obj/item/storage/box/donkpockets/donkpockethonk/ComponentInitialize()
. = ..()
var/datum/component/storage/STR = GetComponent(/datum/component/storage)
STR.can_hold = typecacheof(list(/obj/item/reagent_containers/food/snacks/donkpocket/honk))
/obj/item/storage/box/donkpockets/donkpockethonk/PopulateContents()
for(var/i in 1 to 6)
new /obj/item/reagent_containers/food/snacks/donkpocket/honk(src)
donktype = /obj/item/reagent_containers/food/snacks/donkpocket/honk
warmtype = /obj/item/reagent_containers/food/snacks/donkpocket/warm/honk
/obj/item/storage/box/monkeycubes
name = "monkey cube box"
code/modules/food_and_drinks/food/snacks_pizza.dm
+1 -1
View File
@@ -25,7 +25,7 @@
foodtype = GRAIN | VEGETABLES
/obj/item/reagent_containers/food/snacks/pizza/margherita/robo/Initialize()
bonus_reagents += list("nanomachines" = 70)
bonus_reagents += list(/datum/reagent/nanomachines = 70)
return ..()
/obj/item/reagent_containers/food/snacks/pizzaslice/margherita