From 136cd8726853834b21cfacafe04ec3e5dda76288 Mon Sep 17 00:00:00 2001 From: Fluffy <65877598+FluffyGhoster@users.noreply.github.com> Date: Thu, 23 Mar 2023 23:58:41 +0100 Subject: [PATCH] Slimes Atomization (#16080) --- code/modules/mob/living/carbon/slime/slime.dm | 34 +++++++-------- html/changelogs/fluffyghost-flxslimesinit.yml | 41 +++++++++++++++++++ 2 files changed, 58 insertions(+), 17 deletions(-) create mode 100644 html/changelogs/fluffyghost-flxslimesinit.yml diff --git a/code/modules/mob/living/carbon/slime/slime.dm b/code/modules/mob/living/carbon/slime/slime.dm index 217b3fd2907..de884d1b9a1 100644 --- a/code/modules/mob/living/carbon/slime/slime.dm +++ b/code/modules/mob/living/carbon/slime/slime.dm @@ -91,55 +91,55 @@ regenerate_icons() /mob/living/carbon/slime/purple/Initialize(mapload, colour = "purple") - ..() + . = ..() /mob/living/carbon/slime/metal/Initialize(mapload, colour = "metal") - ..() + . = ..() /mob/living/carbon/slime/orange/Initialize(mapload, colour = "orange") - ..() + . = ..() /mob/living/carbon/slime/blue/Initialize(mapload, colour = "blue") - ..() + . = ..() /mob/living/carbon/slime/dark_blue/Initialize(mapload, colour = "dark blue") - ..() + . = ..() /mob/living/carbon/slime/dark_purple/Initialize(mapload, colour = "dark purple") - ..() + . = ..() /mob/living/carbon/slime/yellow/Initialize(mapload, colour = "yellow") - ..() + . = ..() /mob/living/carbon/slime/silver/Initialize(mapload, colour = "silver") - ..() + . = ..() /mob/living/carbon/slime/pink/Initialize(mapload, colour = "pink") - ..() + . = ..() /mob/living/carbon/slime/red/Initialize(mapload, colour = "red") - ..() + . = ..() /mob/living/carbon/slime/gold/Initialize(mapload, colour = "gold") - ..() + . = ..() /mob/living/carbon/slime/green/Initialize(mapload, colour = "green") - ..() + . = ..() /mob/living/carbon/slime/oil/Initialize(mapload, colour = "oil") - ..() + . = ..() /mob/living/carbon/slime/adamantine/Initialize(mapload, colour = "adamantine") - ..() + . = ..() /mob/living/carbon/slime/black/Initialize(mapload, colour = "black") - ..() + . = ..() /mob/living/carbon/slime/cerulean/Initialize(mapload, colour = "cerulean") - ..() + . = ..() /mob/living/carbon/slime/pyrite/Initialize(mapload, colour = "pyrite") - ..() + . = ..() /mob/living/carbon/slime/getToxLoss() return toxloss diff --git a/html/changelogs/fluffyghost-flxslimesinit.yml b/html/changelogs/fluffyghost-flxslimesinit.yml new file mode 100644 index 00000000000..41890eaa91b --- /dev/null +++ b/html/changelogs/fluffyghost-flxslimesinit.yml @@ -0,0 +1,41 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: Fluffyghost + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - bugfix: "Fixes slime initialization, so that the correct init hint is returned to SSAtoms."