b3cc376f1c
Critter crates now actually show what they contain in their cargo manifests ( #26845 )
...
Co-authored-by: adrermail@gmail.com <adrermail@gmail.com >
2024-09-22 23:03:55 +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
f0cef57c17
Nian Caterpillar Infestation and Worme Invasion ( #25560 )
...
* I hate DMI merge conflicts.
* Attempt at full merge conflict resolution
* Ticked >:C
* Moves the include because
* Fixes missing proc.
* 🫃
* Readds the worme cubes to all places the other bunches are. As well as changes the xenobiology console to spit out the type of monkey/primitive form that the monkey recycler is set to.
* Adds changes requested by DGamerL
* Replaces space indents with tabs. Error caused by copy pasting.
* Update code/modules/mob/living/simple_animal/friendly/nian_caterpillar.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Signed-off-by: Spaghetti-bit <60483458+Spaghetti-bit@users.noreply.github.com >
* Uniforms the tab spacing.
* Apply suggestions from code review
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
Signed-off-by: Spaghetti-bit <60483458+Spaghetti-bit@users.noreply.github.com >
* Adds requested changes from @lewcc
* Removes so missed #undef in `monkey.dm`
---------
Signed-off-by: Spaghetti-bit <60483458+Spaghetti-bit@users.noreply.github.com >
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Co-authored-by: DGamerL <108773801+DGamerL@users.noreply.github.com >
2024-06-22 18:20:27 +00:00
15e7fcdb3f
Improves barsigns and makes them buildable. ( #24685 )
...
* Improves barsigns and makes them buildable.
* Requested fixes.
* fingerprints and a parent call on attack_hand() (sure hope this doesn't break anything)
* More fixes. (the change to barsigns.dmi is removing a bunch of almost-transparent pixels on the mead bay sign that shouldn't have been there)
* Even more fixes.
* Better code and sprite fixes.
* early returns
* better
* more
* switch
* qwertyuiop
* whoops
* maps are stupid
* mcramon sprites :o
* i hope mapmerge works this time
* i hope mapmerge works THIS time
* zrsxdctfhghfcdszzsxdgcfhv
---------
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com >
2024-05-02 09:59:35 +00:00
Deniz and GitHub
576cbdcf25
Cargo "View Contents" Fix ( #24562 )
...
* contains_special
* contains special list additions
* keep on testing
* moar
* test test
* get manifest
* make sure
* indentation mistake
2024-03-18 18:32:33 +00:00
0667f20681
move all EOL comments on typepath names to dmdoc ( #23928 )
...
* move all EOL comments on typepath names to dmdoc
* Apply suggestions from code review
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
* Apply suggestions from code review
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com >
---------
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Co-authored-by: S34N <12197162+S34NW@users.noreply.github.com >
2024-03-01 20:05:49 +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
Mitchs98 and GitHub
e77026b500
Adds a Condiment Crate, Orderable from Cargo. ( #22863 )
...
* crates ur condiments
* henrifix
2023-10-16 18:48:19 +01:00
Contrabang and GitHub
032e1c1501
foodcrate ( #21207 )
2023-06-14 21:17:14 +01:00
bdb8039c8f
Adds gorillas and cargorillas ( #20830 )
...
* goril
* goril2
* arms
* goril3
* goril4
* rampaging
* emote
* trait
* more gorilla
* ooga
* Magillitis Serum Autoinjector, crates
* return to monke
* remove unused trait
* oops
* sirryan
* earth
* Update code/modules/mob/living/simple_animal/hostile/gorilla/gorilla.dm
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
* Update code/modules/reagents/chemistry/reagents/misc_reagents.dm
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
* fixes and stuff
* gorilla text clarification
* tweak probs, stop if dead
* volume
* gorilla sleeping attack
* Apply suggestions from code review
Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com >
---------
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
Co-authored-by: Nathan Winters <100448493+CinnamonSnowball@users.noreply.github.com >
2023-06-01 18:36:07 -05:00
Henri215 and GitHub
baf269ac16
Supply packs tweaks ( #19751 )
...
* supply packs tweaks
* removed by mistake
* ops
* wizard costume added to costume crate
* added back beekeeper suit crate
* removed bottler crate
2022-11-25 21:11:20 +01:00
61145a02f8
[TGUI] Space Credit Economy Overhaul + Supply Point -> Space Cash ( #19209 )
...
* initial edits
* initial edits
* converting shit over to machinery/economy
* vending and mapping fixes
* vending fix pt.2
* Converts Supply Economy to Use Space Credits instead of Supply Points
* Job Payment, NanoBank, and Paychecks
* clothing type path fixes (damn merge conflicts)
* fixes map typepath issues
* adjusts supply prices
* Vendor Price Adjustments
* account uplink terminal tweaks
* please pass tests
* Apply suggestions from code review
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com >
* reviews and bug fixes
* Review Suggestions/Fixes and Request Console Rewrite
* edits
* vending changes for merge
* typepath fix
* final tweaks
* proc ref fixes
* Fixes and Tweaks from 2nd TM
* rebuild TGUI
* final tweaks
* Apply suggestions from code review
Co-authored-by: Farie82 <farie82@users.noreply.github.com >
* requested reviews
* tweaks
* updates slot machine winnings
* fixes
* GC fixes
* fixes
* oops. still need to deconflict this
* Apply suggestions from code review
Co-authored-by: Farie82 <farie82@users.noreply.github.com >
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
* requested changes and bug fixes
* atm runtime fix
* requested reviews
* vend act stuff
* attempt to pass tests
* supply packs fix
* user tochat -> debug log
* FINAL FIXES
* removes CC db stuff
* Apply suggestions from code review
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com >
Co-authored-by: AffectedArc07 <25063394+AffectedArc07@users.noreply.github.com >
Co-authored-by: Farie82 <farie82@users.noreply.github.com >
Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com >
Co-authored-by: Luc <89928798+lewcc@users.noreply.github.com >
2022-11-21 23:30:50 +00:00
