-
Notifications
You must be signed in to change notification settings - Fork 523
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Food Cart #20544
Open
alsoandanswer
wants to merge
13
commits into
Aurorastation:master
Choose a base branch
from
alsoandanswer:burgercart
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Food Cart #20544
Changes from all commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
d1f8dd8
Food Cart
alsoandanswer aeddb18
hail the omnissiah
alsoandanswer c8181df
god, i hope this works
alsoandanswer 9a174fa
some stuff
alsoandanswer abd45e1
Update code/modules/cooking/machinery/foodcart.dm
alsoandanswer 95e9c5c
Update code/modules/cooking/machinery/foodcart.dm
alsoandanswer ea0cd4d
push ze cart
alsoandanswer 829384a
Update code/modules/cooking/machinery/foodcart.dm
alsoandanswer d3e92d2
Update code/modules/cooking/machinery/foodcart.dm
alsoandanswer 2390578
Update code/modules/cooking/machinery/foodcart.dm
alsoandanswer ea411fa
Update code/modules/cooking/machinery/foodcart.dm
alsoandanswer c286345
Update code/modules/cooking/machinery/foodcart.dm
alsoandanswer 9c43485
Update code/modules/cooking/machinery/foodcart.dm
alsoandanswer File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
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,165 @@ | ||
/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 // When it's anchored and has all it's things outside | ||
var/obj/machinery/appliance/cooker/grill/stand/cart_griddle // Griddle inside of the foodcart | ||
var/obj/machinery/smartfridge/foodheater/stand/cart_smartfridge // Smartfridge inside of foodcart | ||
var/obj/structure/table/reinforced/wood/cart_table // Table inside of foodcart | ||
var/obj/effect/food_cart_stand/cart_tent // Overlay that spawns once foodcart is setup | ||
var/list/packed_things // Contains cart_griddle, cart_smartfridge, cart_table, cart_cent | ||
|
||
/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() | ||
QDEL_NULL(cart_griddle) | ||
QDEL_NULL(cart_smartfridge) | ||
QDEL_NULL(cart_table) | ||
QDEL_NULL(cart_tent) | ||
packed_things.Cut() | ||
return ..() | ||
|
||
/obj/machinery/food_cart/get_examine_text(mob/user, distance, is_adjacent, infix, suffix) | ||
. = ..() | ||
if(stat & BROKEN) | ||
return | ||
if(cart_griddle.stat & BROKEN) | ||
. += SPAN_WARNING("The stand's [SPAN_BOLD("grill")] is completely broken!") | ||
else | ||
. += SPAN_NOTICE("The stand's [SPAN_BOLD("grill")] is intact.") | ||
. += SPAN_NOTICE("The stand's [SPAN_BOLD("fridge")] seems fine.") //weirdly enough, these fridges don't break | ||
. += SPAN_NOTICE("The stand's [SPAN_BOLD("table")] seems fine.") | ||
|
||
/obj/machinery/food_cart/proc/pack_up() // Retract the structures into the food cart | ||
if(!unpacked) | ||
return | ||
visible_message(SPAN_NOTICE("[src] retracts all of it's unpacked components.")) | ||
for(var/obj/object as anything in packed_things) | ||
UnregisterSignal(object, COMSIG_MOVABLE_MOVED) | ||
object.forceMove(src) | ||
if(!(cart_griddle?.stat & BROKEN)) // Don't draw power if it's packed inside | ||
cart_griddle.stat = POWEROFF | ||
cart_griddle.use_power = POWER_USE_OFF | ||
cart_griddle.update_icon() | ||
if(!(cart_smartfridge?.stat & BROKEN)) | ||
cart_smartfridge.use_power = POWER_USE_OFF | ||
anchored = FALSE | ||
unpacked = FALSE | ||
|
||
/** | ||
* Deploy the structures inside the food cart | ||
* | ||
* * iteration - counter for how many items have been unpacked, increment for each item unpacked | ||
* * cart_space - temporary overlay showing non-dense and dense tiles checked | ||
Comment on lines
+68
to
+69
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. None of these is a parameter of this proc |
||
* | ||
*/ | ||
/obj/machinery/food_cart/proc/unpack(mob/user) | ||
alsoandanswer marked this conversation as resolved.
Show resolved
Hide resolved
|
||
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 | ||
if(!(cart_smartfridge?.stat & BROKEN)) // Unpacked, draw power | ||
cart_smartfridge.use_power = POWER_USE_IDLE | ||
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 | ||
playsound(get_turf(src), 'sound/items/rfd_start.ogg', 50, FALSE) | ||
to_chat(user, SPAN_NOTICE("You attempt to [unpacked ? "pack up" :"unpack"] [src]...")) | ||
if(!do_after(user, 5 SECONDS, src)) | ||
playsound(get_turf(src), 'sound/items/rfd_interrupt.ogg', 50, FALSE) | ||
return | ||
playsound(get_turf(src), 'sound/items/rfd_end.ogg', 50, FALSE) | ||
if(unpacked) | ||
pack_up() | ||
else | ||
unpack(user) | ||
|
||
/** | ||
* Step and check whether cart structures have non-dense space to placed onto | ||
* | ||
* * has_space - sets to FALSE if any turf in build area has density = TRUE | ||
* * grabbed_turf - starts one tile SOUTH of cart, then sequentially checks one tile EAST | ||
* * cart_space - temporary overlay showing non-dense and dense tiles checked | ||
Comment on lines
+117
to
+119
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. ??? None of these is even a parameter of this proc, which takes no parameter |
||
* | ||
* Returns a boolean | ||
*/ | ||
/obj/machinery/food_cart/proc/check_setup_place() | ||
alsoandanswer marked this conversation as resolved.
Show resolved
Hide resolved
|
||
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.density || T.contains_dense_objects()) | ||
has_space = FALSE | ||
new /obj/effect/temp_visual/cart_space/bad(T) | ||
else | ||
new /obj/effect/temp_visual/cart_space(T) | ||
return has_space | ||
|
||
/** | ||
* Some part of the food cart went missing | ||
*/ | ||
/obj/machinery/food_cart/proc/lost_part(atom/movable/source, force) | ||
alsoandanswer marked this conversation as resolved.
Show resolved
Hide resolved
|
||
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)) | ||
atom_break() | ||
|
||
/obj/machinery/food_cart/atom_break() | ||
. = ..() | ||
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
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.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
None of these are a DMDoc
https://github.com/Aurorastation/Aurora.3/blob/master/.github/guides/STYLE.md#how-to-document