diff --git a/code/modules/client/preference_setup/loadout/items/shoes.dm b/code/modules/client/preference_setup/loadout/items/shoes.dm index 7bad25a9cc7..52d0f9b79ff 100644 --- a/code/modules/client/preference_setup/loadout/items/shoes.dm +++ b/code/modules/client/preference_setup/loadout/items/shoes.dm @@ -152,6 +152,12 @@ slippers["worn bunny slippers"] = /obj/item/clothing/shoes/slippers/worn gear_tweaks += new /datum/gear_tweak/path(slippers) +/datum/gear/shoes/recolourable_slippers + display_name = "slippers (colourable)" + description = "Slippers, in a selection of colours." + path = /obj/item/clothing/shoes/slippers/recolourable_slippers + flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION + /datum/gear/shoes/recolourable_shoes display_name = "shoe selection (colourable)" description = "Shoes, in a selection of colors." diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm index 170b34bae86..5e23a35a749 100644 --- a/code/modules/clothing/glasses/glasses.dm +++ b/code/modules/clothing/glasses/glasses.dm @@ -841,6 +841,12 @@ BLIND // can't see anything desc = "A blindfold that covers the eyes, this one seems to be made of thinner material." tint = TINT_NONE // It's practically a fluff thing anyway, so. +/obj/item/clothing/glasses/sunglasses/blindfold/scc_sleepmask + name = "\improper SCC Sleepmask" + desc = "A sleep mask, branded with the unmistakable logo of the Stellar Corporate Conglomerate. A small tag on the inside indicates it is a Nyx-brand Sleep Mask, produced by Idris Incorporated for Stellar Corporate Conglomerate vessels." + icon_state = "scc_sleepmask" + item_state = "scc_sleepmask" + /obj/item/clothing/glasses/sunglasses/blinders name = "vaurcae blinders" desc = "Specially designed Vaurca blindfold, designed to let in just enough light to see." diff --git a/code/modules/clothing/shoes/slippers.dm b/code/modules/clothing/shoes/slippers.dm index 00c57060594..2ad32bd2778 100644 --- a/code/modules/clothing/shoes/slippers.dm +++ b/code/modules/clothing/shoes/slippers.dm @@ -27,3 +27,15 @@ desc = "Slippers made to look like baby carp, but on your feet! Squeeeeeee!!" item_state = "carpslippers" icon_state = "carpslippers" + +/obj/item/clothing/shoes/slippers/recolourable_slippers + desc = "A pair of simple slippers, in a variety of colours." + name = "slippers" + icon_state = "colourslippers" + item_state = "colourslippers" + +/obj/item/clothing/shoes/slippers/scc_slippers + desc = "A pair of simple slippers, branded with the unmistakable logo of the Stellar Corporate Conglomerate. A small logo on the inside indicates it is a pair of Nyx-brand slippers, produced by Idris Incorporated for Stellar Corporate Conglomerate vessels." + name = "\improper SCC Slippers" + icon_state = "sccslippers" + item_state = "sccslippers" diff --git a/html/changelogs/stev-the-third-slippers.yml b/html/changelogs/stev-the-third-slippers.yml new file mode 100644 index 00000000000..19823a37290 --- /dev/null +++ b/html/changelogs/stev-the-third-slippers.yml @@ -0,0 +1,59 @@ +################################ +# 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 +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: steviii + +# 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, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Adds an SCC-branded sleepmask and slippers, along with generic recolourable slippers." + - rscadd: "Adds the generic slippers to the recovery ward in the medbay, and the SCC-branded sleepmask and slippers to the intrepid." diff --git a/icons/mob/eyes.dmi b/icons/mob/eyes.dmi index 40565f47a14..07ac537bcda 100644 Binary files a/icons/mob/eyes.dmi and b/icons/mob/eyes.dmi differ diff --git a/icons/obj/clothing/glasses.dmi b/icons/obj/clothing/glasses.dmi index d25a7a971e8..8ff3d00b03e 100644 Binary files a/icons/obj/clothing/glasses.dmi and b/icons/obj/clothing/glasses.dmi differ diff --git a/icons/obj/item/clothing/shoes/slippers.dmi b/icons/obj/item/clothing/shoes/slippers.dmi index be49aa8fac5..33e84b63094 100644 Binary files a/icons/obj/item/clothing/shoes/slippers.dmi and b/icons/obj/item/clothing/shoes/slippers.dmi differ diff --git a/maps/sccv_horizon/sccv_horizon.dmm b/maps/sccv_horizon/sccv_horizon.dmm index 2bf048f02fa..411074e34af 100644 --- a/maps/sccv_horizon/sccv_horizon.dmm +++ b/maps/sccv_horizon/sccv_horizon.dmm @@ -15441,6 +15441,7 @@ icon_state = "0-4" }, /obj/machinery/power/apc/shuttle/north, +/obj/machinery/floodlight, /turf/simulated/floor/plating, /area/horizon/shuttle/intrepid/port_compartment) "bZX" = ( @@ -23872,9 +23873,7 @@ /obj/machinery/atmospherics/pipe/manifold/hidden/supply{ dir = 8 }, -/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ - dir = 10 - }, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers, /turf/simulated/floor/tiled/dark, /area/horizon/shuttle/intrepid/port_storage) "dfx" = ( @@ -29104,6 +29103,9 @@ /obj/effect/floor_decal/corner/brown{ dir = 6 }, +/obj/structure/railing/mapped{ + dir = 1 + }, /turf/simulated/floor/tiled/dark, /area/horizon/shuttle/intrepid/port_compartment) "dNm" = ( @@ -73852,9 +73854,6 @@ /obj/item/stack/material/graphite/full, /obj/item/stack/material/steel/full, /obj/effect/floor_decal/industrial/outline/yellow, -/obj/structure/railing/mapped{ - dir = 8 - }, /obj/machinery/camera/network/intrepid{ c_tag = "Intrepid - Port Compartment"; dir = 1 @@ -86689,6 +86688,9 @@ }, /obj/machinery/atmospherics/pipe/simple/hidden/supply, /obj/structure/lattice/catwalk/indoor/grate/dark, +/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{ + dir = 10 + }, /turf/simulated/floor/plating, /area/horizon/shuttle/intrepid/port_storage) "luj" = ( @@ -96202,10 +96204,12 @@ /turf/simulated/floor/tiled/dark/full, /area/horizon/security/checkpoint) "mKI" = ( -/obj/effect/floor_decal/corner/brown{ - dir = 6 +/obj/machinery/floodlight, +/obj/structure/railing/mapped{ + dir = 8 }, -/turf/simulated/floor/tiled/dark, +/obj/effect/floor_decal/industrial/outline/yellow, +/turf/simulated/floor/plating, /area/horizon/shuttle/intrepid/port_compartment) "mKO" = ( /obj/structure/cable/green{ @@ -99980,10 +99984,32 @@ "nlP" = ( /obj/effect/floor_decal/industrial/outline/yellow, /obj/effect/floor_decal/industrial/warning/corner, -/obj/machinery/floodlight, -/obj/machinery/atmospherics/unary/vent_scrubber/on{ - dir = 4 +/obj/item/clothing/shoes/slippers/scc_slippers{ + pixel_y = -4; + pixel_x = 3 }, +/obj/item/clothing/shoes/slippers/scc_slippers{ + pixel_y = -1; + pixel_x = 3 + }, +/obj/item/clothing/shoes/slippers/scc_slippers{ + pixel_y = 2; + pixel_x = 3 + }, +/obj/item/clothing/glasses/sunglasses/blindfold/scc_sleepmask{ + pixel_y = 5 + }, +/obj/item/clothing/glasses/sunglasses/blindfold/scc_sleepmask{ + pixel_y = 7 + }, +/obj/item/clothing/glasses/sunglasses/blindfold/scc_sleepmask{ + pixel_y = 9 + }, +/obj/random/pottedplant_small{ + pixel_y = -2; + pixel_x = -10 + }, +/obj/structure/table/standard, /turf/simulated/floor/tiled/dark/full, /area/horizon/shuttle/intrepid/port_storage) "nlQ" = ( @@ -127826,8 +127852,9 @@ /turf/simulated/floor/tiled, /area/horizon/security/hallway) "qYN" = ( -/obj/effect/floor_decal/industrial/outline/yellow, -/obj/machinery/floodlight, +/obj/machinery/atmospherics/unary/vent_scrubber/on{ + dir = 4 + }, /turf/simulated/floor/tiled/dark/full, /area/horizon/shuttle/intrepid/port_storage) "qYP" = ( @@ -132514,6 +132541,9 @@ /obj/item/clothing/under/medical_gown, /obj/item/clothing/under/medical_gown, /obj/item/clothing/under/medical_gown, +/obj/item/clothing/shoes/slippers/recolourable_slippers, +/obj/item/clothing/shoes/slippers/recolourable_slippers, +/obj/item/clothing/shoes/slippers/recolourable_slippers, /turf/simulated/floor/tiled/full, /area/horizon/medical/ward) "rEY" = (