AffectedArc07 and GitHub
bd91a1b962
Obliterates the RSC ( #26498 )
2024-08-15 18:20:11 +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
0d1eb5110d
Adds Holy Water Darts to Cargo ( #25468 )
...
* die monster you do not belong in this world
* Update code/game/objects/items/weapons/storage/boxes.dm
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
Signed-off-by: Marm <85680653+ItsMarmite@users.noreply.github.com >
* Update code/modules/projectiles/ammunition/ammo_casings.dm
Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com >
Signed-off-by: Marm <85680653+ItsMarmite@users.noreply.github.com >
---------
Signed-off-by: Marm <85680653+ItsMarmite@users.noreply.github.com >
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
Co-authored-by: Matt <116982774+Burzah@users.noreply.github.com >
2024-05-30 15:57:35 +00:00
Brillcrafter and GitHub
6e38ed8592
swaps file names ( #23787 )
2024-01-14 12:40:49 +00:00
37879c530b
Boxes new sprites & little refactor ( #23213 )
...
* Sprites and little refactor
* idk what i am doing
Maybe refactor
* Sort the boxes
* Matches path
* Script and maps
* Okay... that was a strange decision.
* bathroom parts box
* More boxes
* Henri review changes
* Update toy.dmi
* Update code/game/objects/items/weapons/storage/boxes.dm
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
* Update storage.dmi
* Update boxes.dmi
* True conflict solve
I hope
---------
Co-authored-by: Ryan <80364400+Sirryan2002@users.noreply.github.com >
2024-01-06 23:31:36 +00:00
