-
Notifications
You must be signed in to change notification settings - Fork 522
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- rscadd: "Adds a new food cart to the kitchen." - bugfix: "Fixes grill and oven to play their loop sounds only when turned on." - bugfix: "Fixes update_icon() of grill and oven so they actually look turned on when turned on."
- Loading branch information
1 parent
a217abf
commit d1f8dd8
Showing
11 changed files
with
240 additions
and
16 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,142 @@ | ||
| /obj/machinery/food_cart | ||
| name = "food cart" | ||
| desc = "A compact unpackable mobile cooking stand. Wow! When unpacked, it reminds you of those greasy gamer setups some people on NTNet have." | ||
| icon = 'icons/obj/machinery/cooking_machines.dmi' | ||
| icon_state = "foodcart" | ||
| density = TRUE | ||
| anchored = FALSE | ||
| stat = POWEROFF | ||
| use_power = POWER_USE_OFF | ||
| req_access = list(ACCESS_KITCHEN) | ||
| var/unpacked = FALSE | ||
| var/obj/machinery/appliance/cooker/grill/cart_griddle | ||
| var/obj/machinery/smartfridge/foodheater/cart_smartfridge | ||
| var/obj/structure/table/reinforced/cart_table | ||
| var/obj/effect/food_cart_stand/cart_tent | ||
| var/list/packed_things | ||
|
|
||
| /obj/machinery/food_cart/Initialize(mapload) | ||
| . = ..() | ||
| cart_griddle = new(src) | ||
| cart_smartfridge = new(src) | ||
| cart_table = new(src) | ||
| cart_tent = new(src) | ||
| packed_things = list(cart_table, cart_smartfridge, cart_tent, cart_griddle) //middle, left, left, right | ||
| RegisterSignal(cart_griddle, COMSIG_QDELETING, PROC_REF(lost_part)) | ||
| RegisterSignal(cart_smartfridge, COMSIG_QDELETING, PROC_REF(lost_part)) | ||
| RegisterSignal(cart_table, COMSIG_QDELETING, PROC_REF(lost_part)) | ||
| RegisterSignal(cart_tent, COMSIG_QDELETING, PROC_REF(lost_part)) | ||
|
|
||
| /obj/machinery/food_cart/Destroy() | ||
| if(cart_griddle) | ||
| QDEL_NULL(cart_griddle) | ||
| if(cart_smartfridge) | ||
| QDEL_NULL(cart_smartfridge) | ||
| if(cart_table) | ||
| QDEL_NULL(cart_table) | ||
| if(cart_tent) | ||
| QDEL_NULL(cart_tent) | ||
| packed_things.Cut() | ||
| return ..() | ||
|
|
||
| /obj/machinery/food_cart/examine(mob/user, distance, is_adjacent, infix, suffix, show_extended) | ||
| . = ..() | ||
| if(!(stat & BROKEN)) | ||
| if(cart_griddle.stat & BROKEN) | ||
| . += SPAN_WARNING("The stand's <b>griddle</b> is completely broken!") | ||
| else | ||
| . += SPAN_NOTICE("The stand's <b>griddle</b> is intact.") | ||
| . += SPAN_NOTICE("The stand's <b>fridge</b> seems fine.") //weirdly enough, these fridges don't break | ||
| . += SPAN_NOTICE("The stand's <b>table</b> seems fine.") | ||
|
|
||
| /obj/machinery/food_cart/proc/pack_up() | ||
| if(!unpacked) | ||
| return | ||
| visible_message(SPAN_NOTICE("[src] retracts all of it's unpacked components.")) | ||
| for(var/o in packed_things) | ||
| var/obj/object = o | ||
| UnregisterSignal(object, COMSIG_MOVABLE_MOVED) | ||
| object.forceMove(src) | ||
| if(!(cart_griddle.stat & BROKEN)) | ||
| cart_griddle.stat = POWEROFF | ||
| anchored = FALSE | ||
| unpacked = FALSE | ||
|
|
||
| /obj/machinery/food_cart/proc/unpack(mob/user) | ||
| if(unpacked) | ||
| return | ||
| if(!check_setup_place()) | ||
| to_chat(user, SPAN_WARNING("There isn't enough room to unpack here! Bad spaces were marked in red.")) | ||
| return | ||
| visible_message(SPAN_NOTICE("[src] expands into a full stand.")) | ||
| anchored = TRUE | ||
| if(!(cart_griddle.stat & BROKEN)) | ||
| cart_griddle.stat = POWEROFF | ||
| var/iteration = 1 | ||
| var/turf/grabbed_turf = get_step(get_turf(src), EAST) | ||
| for(var/angle in list(0, -45, -45, 45)) | ||
| var/turf/T = get_step(grabbed_turf, turn(SOUTH, angle)) | ||
| var/obj/thing = packed_things[iteration] | ||
| thing.forceMove(T) | ||
| RegisterSignal(thing, COMSIG_MOVABLE_MOVED, PROC_REF(lost_part)) | ||
| iteration++ | ||
| unpacked = TRUE | ||
|
|
||
| /obj/machinery/food_cart/attack_hand(mob/living/user, list/modifiers) | ||
| . = ..() | ||
| if(stat & BROKEN) | ||
| to_chat(user, SPAN_WARNING("[src] is completely busted.")) | ||
| return | ||
| var/obj/item/card/id/id_card = user.GetIdCard() | ||
| if(!check_access(id_card)) | ||
| playsound(src, 'sound/machines/buzz-sigh.ogg', 30, TRUE) | ||
| return | ||
| to_chat(user, SPAN_NOTICE("You attempt to [unpacked ? "pack up" :"unpack"] [src]...")) | ||
| if(!do_after(user, 5 SECONDS, src)) | ||
| to_chat(user, SPAN_WARNING("Your [unpacked ? "" :"un"]packing of [src] was interrupted!")) | ||
| return | ||
| if(unpacked) | ||
| pack_up() | ||
| else | ||
| unpack(user) | ||
|
|
||
| /obj/machinery/food_cart/proc/check_setup_place() | ||
| var/has_space = TRUE | ||
| var/turf/grabbed_turf = get_step(get_turf(src), EAST) | ||
| for(var/angle in list(0, -45, 45)) | ||
| var/turf/T = get_step(grabbed_turf, turn(SOUTH, angle)) | ||
| if(T && !T.density) | ||
| new /obj/effect/temp_visual/cart_space(T) | ||
| else | ||
| has_space = FALSE | ||
| new /obj/effect/temp_visual/cart_space/bad(T) | ||
| return has_space | ||
|
|
||
| /obj/machinery/food_cart/proc/lost_part(atom/movable/source, force) | ||
| SIGNAL_HANDLER | ||
|
|
||
| //okay, so it's deleting the fridge or griddle which are more important. We're gonna break the machine then | ||
| UnregisterSignal(cart_griddle, list(COMSIG_QDELETING, COMSIG_MOVABLE_MOVED)) | ||
| UnregisterSignal(cart_smartfridge, list(COMSIG_QDELETING, COMSIG_MOVABLE_MOVED)) | ||
| UnregisterSignal(cart_table, list(COMSIG_QDELETING, COMSIG_MOVABLE_MOVED)) | ||
| UnregisterSignal(cart_tent, list(COMSIG_QDELETING, COMSIG_MOVABLE_MOVED)) | ||
| Destroy() | ||
|
|
||
| /obj/machinery/food_cart/Destroy() | ||
| . = ..() | ||
| pack_up() | ||
| if(!QDELETED(cart_griddle)) | ||
| QDEL_NULL(cart_griddle) | ||
| if(!QDELETED(cart_smartfridge)) | ||
| QDEL_NULL(cart_smartfridge) | ||
| if(!QDELETED(cart_table)) | ||
| QDEL_NULL(cart_table) | ||
| if(!QDELETED(cart_tent)) | ||
| QDEL_NULL(cart_tent) | ||
|
|
||
| /obj/effect/food_cart_stand | ||
| name = "food cart tent" | ||
| desc = "Something to battle the sun, for there are no breaks for the burger flippers." | ||
| icon = 'icons/obj/fluff/3x3.dmi' | ||
| icon_state = "stand" | ||
| layer = ABOVE_HUMAN_LAYER //big mobs will still go over the tent, this is fine and cool |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| ################################ | ||
| # Example Changelog File | ||
| # | ||
| # Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. | ||
| # | ||
| # Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) | ||
| # When it is, any changes listed below will disappear. | ||
| # | ||
| # Valid Prefixes: | ||
| # bugfix | ||
| # - (fixes bugs) | ||
| # wip | ||
| # - (work in progress) | ||
| # qol | ||
| # - (quality of life) | ||
| # soundadd | ||
| # - (adds a sound) | ||
| # sounddel | ||
| # - (removes a sound) | ||
| # rscadd | ||
| # - (adds a feature) | ||
| # rscdel | ||
| # - (removes a feature) | ||
| # imageadd | ||
| # - (adds an image or sprite) | ||
| # imagedel | ||
| # - (removes an image or sprite) | ||
| # spellcheck | ||
| # - (fixes spelling or grammar) | ||
| # experiment | ||
| # - (experimental change) | ||
| # balance | ||
| # - (balance changes) | ||
| # code_imp | ||
| # - (misc internal code change) | ||
| # refactor | ||
| # - (refactors code) | ||
| # config | ||
| # - (makes a change to the config files) | ||
| # admin | ||
| # - (makes changes to administrator tools) | ||
| # server | ||
| # - (miscellaneous changes to server) | ||
| ################################# | ||
|
|
||
| # Your name. | ||
| author: Wowzewow (Wezzy) | ||
|
|
||
| # Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. | ||
| delete-after: True | ||
|
|
||
| # Any changes you've made. See valid prefix list above. | ||
| # INDENT WITH TWO SPACES. NOT TABS. SPACES. | ||
| # SCREW THIS UP AND IT WON'T WORK. | ||
| # Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. | ||
| # Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. | ||
| changes: | ||
| - rscadd: "Adds a new food cart to the kitchen." | ||
| - bugfix: "Fixes grill and oven to play their loop sounds only when turned on." | ||
| - bugfix: "Fixes update_icon() of grill and oven so they actually look turned on when turned on." |
Binary file not shown.
Binary file not shown.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters