diff --git a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm index 80696776fe5..fa9aa96a153 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/freezer.dm @@ -93,3 +93,12 @@ for(var/i = 0, i < 2, i++) new /obj/item/reagent_containers/food/drinks/carton/soymilk(src) new /obj/item/reagent_containers/food/condiment/sugar(src) + +/obj/structure/closet/secure_closet/freezer/kois + name = "k'ois freezer" + desc = "A freezer with k'ois inside. Don't eat this unless you're a Vaurca!" + +/obj/structure/closet/secure_closet/freezer/kois/fill() + ..() + for(var/i = 0, i < 8, i++) + new /obj/item/reagent_containers/food/snacks/grown/kois(src) diff --git a/html/changelogs/Lavillastrangiato - biohazardalert.yml b/html/changelogs/Lavillastrangiato - biohazardalert.yml new file mode 100644 index 00000000000..1d0d87270f9 --- /dev/null +++ b/html/changelogs/Lavillastrangiato - biohazardalert.yml @@ -0,0 +1,42 @@ +################################ +# 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: Lavillastrangiato + +# 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: + - rscadd: "Adds k'ois freezer subtype." + - rscadd: "Puts a k'ois freezer in the kitchen." diff --git a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm index e85f21d2bb8..88516736ecc 100644 --- a/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm +++ b/maps/sccv_horizon/sccv_horizon-2_deck_2.dmm @@ -1997,6 +1997,11 @@ /obj/structure/cable/green{ icon_state = "0-4" }, +/obj/structure/closet/secure_closet/freezer/kois, +/obj/effect/floor_decal/industrial/warning/full, +/obj/structure/sign/biohazard{ + pixel_x = -32 + }, /turf/simulated/floor/tiled/freezer{ name = "cooled tiles"; temperature = 253.15