* modernization is nonnegotiable
* cable
* 3000 slanty face emojis of bmon
* i conflicted with one of my other PRs. bruh
* life is a merge conflict
* as above
* update_overlays()
* jaw jaw jaw jaw
* always test your icons
* tweak to onbelt
* belt again
* deconflict
* jawbeltupdateagaingodammit
* spriterror
* seconds
* grammar fixes
cant - can't
removes duplicate the from mobs
the pain in your the -
treads on the lit the lit -
what you can cook with this the -
* should fix the merge conflict
0 to FALSE
* unconflicts
panther will have to be fixed at a later date
* Changed Milo to Miso
* Update baked_goods.dm
* typo fix
* Revert "typo fix"
This reverts commit 3f6ca6a5b9.
* Revert "Revert "typo fix""
This reverts commit b67ed80d8d.
* Update food.dm
* removing beff and pepperoni
* adding onions as juiceable
* made drying grapes give you homemade raisins since homemade raisins were already in the code
* undo the onionjuice because it crashed my test server
* replaced the vomit cheese with vomit cheese substitute, removed beff and pepperoni, made weird cheese actualy spawn a weird cheese wedge
* updated enzyme name and description to match how catalysts actually work and how the enzyme already works in game (and has for almost a decade in game)
* Moved onion rings to the deepfryer instead of microwave
* makes the fries recipe actually makes sense, and makes it benefit from the upgrades of the processor (so you can get more fries)
* made macaroni and cheese names consistent
* moved two recipes to oven from microwave
* Wine comes from grapes ya dingus
* name fix
* made burger recipes consistent except for the big bite and super big bites
* yaki imo is baked whole sweet potato, not processed!
* Update code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
* Update code/modules/food_and_drinks/kitchen_machinery/deep_fryer.dm
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
* Update code/modules/food_and_drinks/food/foods/pizza.dm
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
* made food names consistently lower case
Except of course for foods that are supposed to be brand names, like Space Twinkie or the BigBite burger
* Missed one
* Back to american mac 'n' cheese spelling
* Macaroniiiii
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com>
The RSF cannot, in fact, create service items on floors. As amusing as
dosh on every floor tile would be, I think it's best to just change the
message and not functionality.
Refactors to delete copypaste and avoid magic numbers.
Replaces tofu-turkey snack with a donut.
Adds several new reagents, including ice (enables iced tea & coffee,
which have the same stats as normal versions), cream (enables doctor's
delight, a -1 tox/sec fruit drink), cola & soda (enables brown star, a
fruit drink, as well as plain old cola/sodawater), and basic alcohol
reagents tequila/vodka/whiskey (which enable tequilla sunrise,
margarita, bloody mary, screwdriver, 'syndicate bomb', whiskey cola,
whiskey soda).
Currently, to_chat is literally just a proc that does user << message.
But it'll let us do output modification in the future, especially for
something like Goon's HTML chat.
Big thanks to PJB for his to_chat script, see
https://github.com/d3athrow/vgstation13/pull/6625 for more details.
- Also adds ABSTRACT and NODROP flags in preparation for removal of
canremove and abstract vars.
- Sorts some of the setup.dm flags so they're in order.
- Replaces 'flags & 2' in policetape.dm with pass_flags & PASSTABLE,
should have the same effect.
Standardization of the object tree and some modified functionality.
Moved a lot of storage/*_kit and similar boxes to storage/box/* ; most of these can now be found in boxes.dm. First aid kits remain a separate item type.
Replacement Light boxes pick up lights (for example broken ones) when used on them
Moved weapon/secstorage to storage/secure
Moved plant bags, ore satchel, trash bag, and sheet snatcher to storage/bag, in bags.dm
Fixed reagent_containers and snacks to pass through attackby() so the use_to_pickup code works. This affects plant bags, trash bags, and pill bottles.
Dice packs are now pill bottles, and all pill bottles can pick up dice.
Added error handling to uplink/generate_menu() so that one mistyped string doesn't bork the whole syndie uplink menu, since strings cannot be type-checked at compile time.
Cigarette packs and crayon boxes are now storage/fancy, however they retain existing update_icon() code.
Added a comment to storage.dm so that future people know where to look for use_to_pickup and allow_quick_gather code.
Updated all maps.
I've tried to test this thoroughly but I wouldn't be surprised if there were a few lingering issues. Try not to panic if you encounter any.
Full (i think) list of changed paths:
/obj/item/weapon/storage/flashbang_kit > /obj/item/weapon/storage/box/flashbangs
/obj/item/weapon/storage/body_bag_box > /obj/item/weapon/storage/box/bodybags
/obj/item/weapon/storage/chemimp_kit > /obj/item/weapon/storage/box/chemimp
/obj/item/weapon/storage/trackimp_kit > /obj/item/weapon/storage/box/trackimp
/obj/item/weapon/storage/seccart_kit > /obj/item/weapon/storage/box/seccarts
/obj/item/weapon/storage/handcuff_kit > /obj/item/weapon/storage/box/handcuffs
/obj/item/weapon/cigpacket > /obj/item/weapon/storage/fancy/cigarettes
/obj/item/weapon/storage/mousetraps > /obj/item/weapon/storage/box/mousetraps
/obj/item/weapon/storage/PDAbox > /obj/item/weapon/storage/box/PDAs
/obj/item/weapon/storage/id_kit > /obj/item/weapon/storage/box/ids
/obj/item/weapon/storage/lightbox/mixed > /obj/item/weapon/storage/box/lights/mixed
/obj/item/weapon/storage/donkpocket_kit > /obj/item/weapon/storage/box/donkpockets
/obj/item/weapon/storage/beakerbox > /obj/item/weapon/storage/box/beakers
/obj/item/weapon/storage/syringes > /obj/item/weapon/storage/box/syringes
/obj/item/weapon/storage/gl_kit > /obj/item/weapon/storage/box/rxglasses
/obj/item/weapon/storage/diskbox > /obj/item/weapon/storage/box/disks
/obj/item/weapon/storage/stma_kit > /obj/item/weapon/storage/box/masks
/obj/item/weapon/storage/lglo_kit > /obj/item/weapon/storage/box/gloves
/obj/item/weapon/storage/lightbox/bulbs > /obj/item/weapon/storage/box/lights/bulbs
/obj/item/weapon/plantbag > /obj/item/weapon/storage/bag/plants
/obj/item/weapon/storage/satchel > /obj/item/weapon/storage/bag/ore
/obj/item/weapon/trashbag > /obj/item/weapon/storage/bag/trash
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5494 316c924e-a436-60f5-8080-3fe189b3f50e
Removed defines/obj/toy.dm and moved the defines down to objects/items/toys.dm
Moved a big chunk of defines out of defines/obj/weapon.dm and into their respective .dm files.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5441 316c924e-a436-60f5-8080-3fe189b3f50e
DGamerL