Contrabang and GitHub
1504ed98be
massive burndown ( #29894 )
2025-07-27 20:52:39 +00:00
52f5ab0efc
Standardized plant names ( #29455 )
...
* 🆑 AmityBlamity
fix: Changed ambrosia_gaia to ambrosiagaia to standardize with other plant names
/🆑
* Update code/modules/hydroponics/grown/ambrosia.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: AmityBlamity <142629851+AmityBlamity@users.noreply.github.com >
---------
Signed-off-by: AmityBlamity <142629851+AmityBlamity@users.noreply.github.com >
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
2025-06-03 21:24:41 +00:00
d90a70ecda
[REFACTOR] Consolidates SLOT_FLAG and SLOT_HUD into one ITEM_SLOT flag ( #26743 )
...
* IT WORKS UP UNTIL THIS POINT
* Consolidates SLOT_FLAG and SLOT_HUD into one
* Remove cover_both_ears
* SLOT_HUD to ITEM_SLOT
* Remove clothing_trait changes for the time being
* Remove accidental copy-paste
* Re-add no-slip var
* More failure to copy-paste correctly
* Leftover flag
* Combine left and right slot flags where possible
* UNGOOF MY DEFINES, PHAND IS NOT A THING
* Minor spacing changes
* Some more fixes from merge
* Seperates ITEM SLOT AMOUNT into two defines
* ON SECOND THOUGHT LETS NOT DO THAT.
* Addresses Contra's review
* Thank you GREP
* Rename ITEM_SLOT_FEET to ITEM_SLOT_SHOES
* Added a comment to the bitmasks in clothing defines
* Rename ITEM_SLOT_TIE to ITEM_SLOT_ACCESSORY
* These are for a seperate PR.
* Magboot fixes
* Requested changes
* Re-add accidental removal
* Wrong flags
* Update code/__DEFINES/clothing_defines.dm
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
Signed-off-by: Chap <erwin@lombok.demon.nl >
* Requested changes
* Merge fixes
* Fix double headset
* Fixes multiple accessories
---------
Signed-off-by: Chap <erwin@lombok.demon.nl >
Co-authored-by: Adrer <adrermail@gmail.com >
Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com >
2024-11-13 13:02:29 +00:00
DGamerL and GitHub
098b13bb33
Removes the empty type of /snacks ( #26010 )
...
* Aaaaa it works
* Add updatepaths
* Add unsaved files
* MATTTTT
* Fixes casino
* Fix
---------
Signed-off-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
2024-07-29 14:46:04 +00:00
db578cdc6f
Makes food not a subtype of reagent holders ( #23379 )
...
* I am suffering
* Alright this should be all now
* Fixes CI
* I hate the online merge resolver.
* This got lost in the merge master
* Updatepaths fixed + new added
* Contra review
* Fixes desserts
* Oops
* This should fix it
* Maybe?
* Attempt 3
* Missed conflict
* Update code/modules/reagents/chemistry/machinery/reagentgrinder.dm
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
* Update code/modules/food_and_drinks/kitchen_machinery/kitchen_machine.dm
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
* Update code/modules/food_and_drinks/food/foods/pizza.dm
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
* Fixes grinders
* Adds comment
* Warrior review
* Warrior + Sirryan review
* Update code/modules/food_and_drinks/food_base.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
---------
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
2024-01-21 19:00:02 +00:00
Contrabang and GitHub
f3f9bd442a
Changes slot number defines from lowercase to all uppercase ( #22297 )
...
* undo all of it
* flags
* back
* head/mask
* left
* right
* Cuffs
* other name changes
* ID and PDA
* idk about calling them SLOT_HUD now
* glasses, gloves, and shoes, oh my!
* the rest
* comment
2023-10-03 18:27:51 +01:00
18a440a9bb
Adjusts 15 berets and 9 other pieces of headwear to properly fit vox heads, part 1 ( #18221 )
...
* Chef hat fix
* Revert "Chef hat fix"
This reverts commit 645d08afddca47ba500042044220+SteelSlayer@users.noreply.github.com >
* Update code/modules/clothing/head/misc.dm
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com >
* Update code/modules/clothing/head/misc.dm
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com >
* Update code/modules/clothing/head/misc.dm
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com >
* Update code/modules/clothing/head/misc.dm
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com >
* Update code/modules/clothing/head/misc.dm
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com >
* Update code/modules/clothing/head/misc.dm
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com >
* Update code/modules/customitems/item_defines.dm
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com >
Co-authored-by: SteelSlayer <42044220+SteelSlayer@users.noreply.github.com >
2022-07-16 15:24:00 -05:00
AffectedArc07 and GitHub
04ba5c1cc9
File standardisation ( #13131 )
...
* Adds the check components
* Adds in trailing newlines
* Converts all CRLF to LF
* Post merge EOF
* Post merge line endings
* Final commit
2020-03-17 18:08:51 -04:00
variableundefined
f4c8678892
Hydroponic Stage 1
2019-08-04 10:37:18 +08:00
variableundefined
7428362d2f
Fixes typo
2018-11-03 20:30:52 +08:00
variableundefined
7905b64076
Port over fermentation barrel, minor refactor of reagent container, add in wine power etc.
2018-11-01 11:01:45 +08:00
Fox McCloud
5c4aa9b3fd
Removes All Weapons
2018-04-15 16:25:56 -04:00
Fox-McCloud
3b59726371
Botany Reagent Changes
2017-02-05 06:25:39 -05:00
Fox-McCloud
3e87bd3370
more adjustments and fixes
2017-01-23 05:56:17 -05:00
Fox-McCloud
dc0710135e
more fixes
2017-01-23 00:53:44 -05:00
Fox-McCloud
706347fd84
even more work
2017-01-22 08:11:31 -05:00
Fox-McCloud
ea76990b7a
Botany Rework
2017-01-21 18:28:03 -05:00
