mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-01-01 05:02:33 +00:00
ed626bfadb
* ports over more nian plushies from shiptest/beestation and introduces plushies into maint loot * remove a value Co-authored-by: warriorstar-orion <orion@snowfrost.garden> Signed-off-by: Hayden Redacted <91229275+haydenredacted@users.noreply.github.com> * removed a value Co-authored-by: warriorstar-orion <orion@snowfrost.garden> Signed-off-by: Hayden Redacted <91229275+haydenredacted@users.noreply.github.com> * removed a value Co-authored-by: warriorstar-orion <orion@snowfrost.garden> Signed-off-by: Hayden Redacted <91229275+haydenredacted@users.noreply.github.com> * remove a value Co-authored-by: warriorstar-orion <orion@snowfrost.garden> Signed-off-by: Hayden Redacted <91229275+haydenredacted@users.noreply.github.com> * Update code/game/objects/effects/spawners/random/plushie_spawners.dm Co-authored-by: warriorstar-orion <orion@snowfrost.garden> Signed-off-by: Hayden Redacted <91229275+haydenredacted@users.noreply.github.com> * Update code/game/objects/effects/spawners/random/plushie_spawners.dm Co-authored-by: warriorstar-orion <orion@snowfrost.garden> Signed-off-by: Hayden Redacted <91229275+haydenredacted@users.noreply.github.com> * this should fix the conflict * please let this upload fix the conflict Signed-off-by: Hayden Redacted <91229275+haydenredacted@users.noreply.github.com> * i need to stop pressing commit as a form of saving, my apologies. * added the dmi back * fixing indentation * removes a comment. Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com> Signed-off-by: Hayden Redacted <91229275+haydenredacted@users.noreply.github.com> * bumps the weight of tools and materials up to 4 --------- Signed-off-by: Hayden Redacted <91229275+haydenredacted@users.noreply.github.com> Co-authored-by: warriorstar-orion <orion@snowfrost.garden> Co-authored-by: Contrabang <91113370+Contrabang@users.noreply.github.com>