mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-01-01 13:12:23 +00:00
f0cef57c17
* 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>