diff --git a/code/game/dna/dna_modifier.dm b/code/game/dna/dna_modifier.dm index 3fc82af2273..e272c996f71 100644 --- a/code/game/dna/dna_modifier.dm +++ b/code/game/dna/dna_modifier.dm @@ -33,7 +33,7 @@ /obj/machinery/dna_scannernew name = "\improper DNA modifier" desc = "It scans DNA structures." - icon = 'icons/obj/sleeper.dmi' + icon = 'icons/obj/machinery/sleeper.dmi' icon_state = "scanner_0" density = 1 anchored = 1.0 diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm index d9db5bd813a..be74bbb5e41 100644 --- a/code/game/machinery/Sleeper.dm +++ b/code/game/machinery/Sleeper.dm @@ -11,7 +11,7 @@
\ Right-click the cell and click 'Eject Occupant' to remove them. You can enter the cell yourself by right clicking and selecting 'Enter Sleeper'. \ Note that you cannot control the sleeper while inside of it." - icon = 'icons/obj/sleeper.dmi' + icon = 'icons/obj/machinery/sleeper.dmi' icon_state = "sleeper" density = TRUE anchored = TRUE diff --git a/code/game/machinery/body_scanner.dm b/code/game/machinery/body_scanner.dm index da9a7da187b..edfa5fd6802 100644 --- a/code/game/machinery/body_scanner.dm +++ b/code/game/machinery/body_scanner.dm @@ -7,7 +7,7 @@ Click your target with Grab intent, then click on the scanner to place them in it. Click the connected terminal to operate. \ Right-click the scanner and click 'Eject Occupant' to remove them. You can enter the scanner yourself in a similar way, using the 'Enter Body Scanner' \ verb." - icon = 'icons/obj/sleeper.dmi' + icon = 'icons/obj/machinery/sleeper.dmi' icon_state = "body_scanner" density = TRUE anchored = TRUE @@ -247,7 +247,7 @@ name = "body scanner console" var/tgui_name = "Zeng-Hu Pharmaceuticals Body Scanner" desc = "An advanced control panel that can be used to interface with a connected body scanner." - icon = 'icons/obj/sleeper.dmi' + icon = 'icons/obj/machinery/sleeper.dmi' icon_state = "body_scannerconsole" var/obj/machinery/bodyscanner/connected var/collapse_desc = "" diff --git a/code/game/machinery/cryo.dm b/code/game/machinery/cryo.dm index 04eecdd6d9b..8bc84208e3b 100644 --- a/code/game/machinery/cryo.dm +++ b/code/game/machinery/cryo.dm @@ -56,7 +56,6 @@ /obj/machinery/atmospherics/unary/cryo_cell/Initialize() . = ..() - icon = 'icons/obj/cryogenics_split.dmi' update_icon() atmos_init() @@ -110,12 +109,6 @@ return 1 -/obj/machinery/atmospherics/unary/cryo_cell/relaymove(mob/living/user, direction) - . = ..() - - if(src.occupant == user && !user.stat) - go_out() - /obj/machinery/atmospherics/unary/cryo_cell/attack_hand(mob/user) ui_interact(user) @@ -215,7 +208,7 @@ if("ejectOccupant") if(!occupant || isslime(usr) || ispAI(usr)) return - go_out() + move_eject() if("goFast") current_stasis_mult = fast_stasis_mult @@ -265,8 +258,8 @@ if(put_mob(L)) user.visible_message(SPAN_NOTICE("[user] puts [L] into [src]."), SPAN_NOTICE("You put [L] into [src]."), range = 3) - qdel(attacking_item) + addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_icon)), 2.5 SECONDS) else if(default_deconstruction_screwdriver(user, attacking_item)) return TRUE @@ -315,31 +308,24 @@ if(user.pulling == L) user.pulling = null + addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_icon)), 2.5 SECONDS) -/obj/machinery/atmospherics/unary/cryo_cell/update_icon() +/obj/machinery/atmospherics/unary/cryo_cell/update_icon(var/only_pickle = FALSE) ClearOverlays() icon_state = "pod[on]" + var/image/I - if(panel_open) - AddOverlays("pod_panel") - - I = image(icon, "pod[on]_top") - I.pixel_z = 32 - AddOverlays(I) - if(occupant) var/image/pickle = image(occupant.icon, occupant.icon_state) pickle.overlays = occupant.overlays pickle.pixel_z = 11 AddOverlays(pickle) + I = image(icon, "pod_over") + AddOverlays(I) - I = image(icon, "lid[on]") - AddOverlays(I) - - I = image(icon, "lid[on]_top") - I.pixel_z = 32 - AddOverlays(I) + if(panel_open) + AddOverlays("pod_panel") if(powered()) var/warn_state = "off" @@ -351,12 +337,12 @@ warn_state = "warn" I = overlay_image(icon, "lights_[warn_state]") AddOverlays(I) - I = overlay_image(icon, "lights_[warn_state]_top") - I.pixel_z = 32 - AddOverlays(I) AddOverlays(emissive_appearance(icon, "lights_mask")) - I = emissive_appearance(icon, "lights_mask_top") - I.pixel_z = 32 + + if(occupant && !only_pickle) + I = image(icon, "pod_liquid") + AddOverlays(I) + I = image(icon, "pod_glass") AddOverlays(I) /obj/machinery/atmospherics/unary/cryo_cell/proc/process_occupant() @@ -403,6 +389,7 @@ occupant = null current_heat_capacity = initial(current_heat_capacity) update_use_power(POWER_USE_IDLE) + flick_overlay_view(mutable_appearance(icon, "pod_opening"), 2.5 SECONDS) update_icon() /obj/machinery/atmospherics/unary/cryo_cell/proc/put_mob(mob/living/carbon/human/M as mob) @@ -434,7 +421,8 @@ update_use_power(POWER_USE_ACTIVE) // M.metabslow = 1 add_fingerprint(usr) - update_icon() + update_icon(TRUE) + flick_overlay_view(mutable_appearance(icon, "pod_closing"), 2.5 SECONDS) return 1 /obj/machinery/atmospherics/unary/cryo_cell/verb/move_eject() @@ -470,6 +458,7 @@ SPAN_NOTICE("You climb into [src]."), range = 3) put_mob(usr) + addtimer(CALLBACK(src, TYPE_PROC_REF(/atom, update_icon)), 2.5 SECONDS) return /atom/proc/return_air_for_internal_lifeform(var/mob/living/lifeform) diff --git a/code/game/machinery/cryopod.dm b/code/game/machinery/cryopod.dm index c23aaa0e065..cf3a32dada9 100644 --- a/code/game/machinery/cryopod.dm +++ b/code/game/machinery/cryopod.dm @@ -166,7 +166,7 @@ /obj/structure/cryofeed name = "cryogenic feed" desc = "A bewildering tangle of machinery and pipes." - icon = 'icons/obj/sleeper.dmi' + icon = 'icons/obj/machinery/sleeper.dmi' icon_state = "cryo_rear" anchored = TRUE dir = WEST @@ -174,14 +174,14 @@ /obj/structure/cryofeed/pipes name = "cryogenic feed pipes" desc = "A bewildering tangle of pipes." - icon = 'icons/obj/sleeper.dmi' + icon = 'icons/obj/machinery/sleeper.dmi' icon_state = "cryo_rear_pipes" //Cryopods themselves. /obj/machinery/cryopod name = "cryogenic freezer" desc = "A man-sized pod for entering suspended animation." - icon = 'icons/obj/sleeper.dmi' + icon = 'icons/obj/machinery/sleeper.dmi' icon_state = "body_scanner" density = TRUE anchored = TRUE diff --git a/code/game/machinery/stasis_bed.dm b/code/game/machinery/stasis_bed.dm index 6a6176ab26c..9b663211c18 100644 --- a/code/game/machinery/stasis_bed.dm +++ b/code/game/machinery/stasis_bed.dm @@ -2,7 +2,7 @@ name = "lifeform stasis unit" desc = "A not so comfortable looking bed with some nozzles at the top and bottom. It will keep someone in stasis." desc_info = "You can alt-click this to toggle it on or off." - icon = 'icons/obj/stasis_bed.dmi' + icon = 'icons/obj/machinery/sleeper.dmi' icon_state = "stasis" anchored = TRUE diff --git a/code/modules/atmospherics/components/unary/cold_sink.dm b/code/modules/atmospherics/components/unary/cold_sink.dm index a25d00861ae..e8d19eeeadb 100644 --- a/code/modules/atmospherics/components/unary/cold_sink.dm +++ b/code/modules/atmospherics/components/unary/cold_sink.dm @@ -7,7 +7,7 @@ desc_info = "Cools down the gas of the pipe it is connected to. It uses massive amounts of electricity while on. \ It can be upgraded by replacing the capacitors, manipulators, and matter bins. It can be deconstructed by screwing the maintenance panel open with a \ screwdriver, and then using a crowbar." - icon = 'icons/obj/sleeper.dmi' + icon = 'icons/obj/machinery/sleeper.dmi' icon_state = "freezer_0" density = 1 anchored = 1 diff --git a/code/modules/atmospherics/components/unary/heat_source.dm b/code/modules/atmospherics/components/unary/heat_source.dm index 352fe777d37..7867696fd37 100644 --- a/code/modules/atmospherics/components/unary/heat_source.dm +++ b/code/modules/atmospherics/components/unary/heat_source.dm @@ -7,7 +7,7 @@ desc_info = "Heats up the gas of the pipe it is connected to. It uses massive amounts of electricity while on. \ It can be upgraded by replacing the capacitors, manipulators, and matter bins. It can be deconstructed by screwing the maintenance panel open with a \ screwdriver, and then using a crowbar." - icon = 'icons/obj/sleeper.dmi' + icon = 'icons/obj/machinery/sleeper.dmi' icon_state = "heater_0" density = 1 anchored = 1 diff --git a/code/modules/ghostroles/spawnpoint/spawnpoint.dm b/code/modules/ghostroles/spawnpoint/spawnpoint.dm index 414595eb802..6d42d4d73f7 100644 --- a/code/modules/ghostroles/spawnpoint/spawnpoint.dm +++ b/code/modules/ghostroles/spawnpoint/spawnpoint.dm @@ -150,7 +150,7 @@ /obj/effect/ghostspawpoint/cryo name = "cryogenic storage pod" desc = "A pod used to store individual in suspended animation" - icon = 'icons/obj/sleeper.dmi' + icon = 'icons/obj/machinery/sleeper.dmi' icon_state = "sleeper-closed" identifier = null //identifier of this spawnpoint diff --git a/html/changelogs/wezzy_medicool.yml b/html/changelogs/wezzy_medicool.yml new file mode 100644 index 00000000000..99aab5363e2 --- /dev/null +++ b/html/changelogs/wezzy_medicool.yml @@ -0,0 +1,58 @@ +################################ +# 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: Wowzewow (Wezzy) + +# 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: + - imageadd: "Improved the sprites for the stasis bed and cryopods." diff --git a/icons/obj/cryogenics.dmi b/icons/obj/cryogenics.dmi index 7961e14889f..846ea3edcb3 100644 Binary files a/icons/obj/cryogenics.dmi and b/icons/obj/cryogenics.dmi differ diff --git a/icons/obj/cryogenics_split.dmi b/icons/obj/cryogenics_split.dmi index 695089a9eb2..7e08484c838 100644 Binary files a/icons/obj/cryogenics_split.dmi and b/icons/obj/cryogenics_split.dmi differ diff --git a/icons/obj/machinery/sleeper.dmi b/icons/obj/machinery/sleeper.dmi new file mode 100644 index 00000000000..7291d385a4d Binary files /dev/null and b/icons/obj/machinery/sleeper.dmi differ diff --git a/icons/obj/sleeper.dmi b/icons/obj/sleeper.dmi deleted file mode 100644 index b0825198f23..00000000000 Binary files a/icons/obj/sleeper.dmi and /dev/null differ diff --git a/icons/obj/stasis_bed.dmi b/icons/obj/stasis_bed.dmi deleted file mode 100644 index 9f5763d6d68..00000000000 Binary files a/icons/obj/stasis_bed.dmi and /dev/null differ diff --git a/maps/away/away_site/sol_bunker/bunker.dmm b/maps/away/away_site/sol_bunker/bunker.dmm index 7299df70807..178271ddadb 100644 --- a/maps/away/away_site/sol_bunker/bunker.dmm +++ b/maps/away/away_site/sol_bunker/bunker.dmm @@ -781,7 +781,7 @@ density = 1; desc = "An old cryogenic freezer ."; dir = 4; - icon = 'icons/obj/sleeper.dmi'; + icon = 'icons/obj/machinery/sleeper.dmi'; icon_state = "body_scanner"; name = "dilapitated cryogenic freezer"; pixel_x = 1 @@ -1472,7 +1472,7 @@ density = 1; desc = "An old cryogenic freezer ."; dir = 4; - icon = 'icons/obj/sleeper.dmi'; + icon = 'icons/obj/machinery/sleeper.dmi'; icon_state = "body_scanner"; name = "dilapitated cryogenic freezer"; pixel_x = 1 @@ -1496,7 +1496,7 @@ density = 1; desc = "An old cryogenic freezer ."; dir = 4; - icon = 'icons/obj/sleeper.dmi'; + icon = 'icons/obj/machinery/sleeper.dmi'; icon_state = "body_scanner"; name = "dilapitated cryogenic freezer"; pixel_x = 1 diff --git a/maps/dungeon_spawns/coc_ship_unique.dmm b/maps/dungeon_spawns/coc_ship_unique.dmm index 0d911026881..a0b6cdd8dc9 100644 --- a/maps/dungeon_spawns/coc_ship_unique.dmm +++ b/maps/dungeon_spawns/coc_ship_unique.dmm @@ -951,7 +951,7 @@ /obj/effect/decal/fake_object{ density = 1; desc = "A no longer functional cryogenic freezer."; - icon = 'icons/obj/sleeper.dmi'; + icon = 'icons/obj/machinery/sleeper.dmi'; icon_state = "body_scanner"; name = "dilapitated cryogenic freezer"; pixel_x = 1 @@ -971,7 +971,7 @@ /obj/effect/decal/fake_object{ density = 1; desc = "A no longer functional cryogenic freezer."; - icon = 'icons/obj/sleeper.dmi'; + icon = 'icons/obj/machinery/sleeper.dmi'; icon_state = "body_scanner"; name = "dilapitated cryogenic freezer"; pixel_x = 1 diff --git a/maps/dungeon_spawns/sol_bunker_unique.dmm b/maps/dungeon_spawns/sol_bunker_unique.dmm index 0ca5715150d..1247bef6581 100644 --- a/maps/dungeon_spawns/sol_bunker_unique.dmm +++ b/maps/dungeon_spawns/sol_bunker_unique.dmm @@ -822,7 +822,7 @@ density = 1; desc = "An old cryogenic freezer ."; dir = 4; - icon = 'icons/obj/sleeper.dmi'; + icon = 'icons/obj/machinery/sleeper.dmi'; icon_state = "body_scanner"; name = "dilapitated cryogenic freezer"; pixel_x = 1 @@ -871,7 +871,7 @@ density = 1; desc = "An old cryogenic freezer ."; dir = 4; - icon = 'icons/obj/sleeper.dmi'; + icon = 'icons/obj/machinery/sleeper.dmi'; icon_state = "body_scanner"; name = "dilapitated cryogenic freezer"; pixel_x = 1 diff --git a/maps/random_ruins/exoplanets/asteroid/coc_ship/coc_ship_unique.dmm b/maps/random_ruins/exoplanets/asteroid/coc_ship/coc_ship_unique.dmm index f524e155e96..f04eae120c4 100644 --- a/maps/random_ruins/exoplanets/asteroid/coc_ship/coc_ship_unique.dmm +++ b/maps/random_ruins/exoplanets/asteroid/coc_ship/coc_ship_unique.dmm @@ -330,7 +330,7 @@ /obj/effect/decal/fake_object{ density = 1; desc = "A no longer functional cryogenic freezer."; - icon = 'icons/obj/sleeper.dmi'; + icon = 'icons/obj/machinery/sleeper.dmi'; icon_state = "body_scanner"; name = "dilapitated cryogenic freezer"; pixel_x = 1 @@ -1372,7 +1372,7 @@ /obj/effect/decal/fake_object{ density = 1; desc = "A no longer functional cryogenic freezer."; - icon = 'icons/obj/sleeper.dmi'; + icon = 'icons/obj/machinery/sleeper.dmi'; icon_state = "body_scanner"; name = "dilapitated cryogenic freezer"; pixel_x = 1