Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New Cryogenics animations and sprites #20413

Merged
merged 5 commits into from
Feb 5, 2025
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion code/game/dna/dna_modifier.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion code/game/machinery/Sleeper.dm
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<br>\
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
Expand Down
4 changes: 2 additions & 2 deletions code/game/machinery/body_scanner.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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 = ""
Expand Down
51 changes: 22 additions & 29 deletions code/game/machinery/cryo.dm
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,6 @@

/obj/machinery/atmospherics/unary/cryo_cell/Initialize()
. = ..()
icon = 'icons/obj/cryogenics_split.dmi'
update_icon()
atmos_init()

Expand Down Expand Up @@ -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)

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -265,8 +258,9 @@
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)
sleep(2.5 SECONDS)
update_icon()
alsoandanswer marked this conversation as resolved.
Show resolved Hide resolved

else if(default_deconstruction_screwdriver(user, attacking_item))
return TRUE
Expand Down Expand Up @@ -315,31 +309,26 @@

if(user.pulling == L)
user.pulling = null
sleep(2.5 SECONDS)
update_icon()
alsoandanswer marked this conversation as resolved.
Show resolved Hide resolved

/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)
var/image/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"
Expand All @@ -351,12 +340,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()
Expand Down Expand Up @@ -403,6 +392,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)
Expand Down Expand Up @@ -434,7 +424,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()
Expand Down Expand Up @@ -470,6 +461,8 @@
SPAN_NOTICE("You climb into [src]."), range = 3)

put_mob(usr)
sleep(2.5 SECONDS)
update_icon()
alsoandanswer marked this conversation as resolved.
Show resolved Hide resolved
return

/atom/proc/return_air_for_internal_lifeform(var/mob/living/lifeform)
Expand Down
6 changes: 3 additions & 3 deletions code/game/machinery/cryopod.dm
Original file line number Diff line number Diff line change
Expand Up @@ -166,22 +166,22 @@
/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

/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
Expand Down
2 changes: 1 addition & 1 deletion code/game/machinery/stasis_bed.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion code/modules/atmospherics/components/unary/cold_sink.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion code/modules/atmospherics/components/unary/heat_source.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion code/modules/ghostroles/spawnpoint/spawnpoint.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
58 changes: 58 additions & 0 deletions html/changelogs/wezzy_medicool.yml
Original file line number Diff line number Diff line change
@@ -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."
Binary file modified icons/obj/cryogenics.dmi
Binary file not shown.
Binary file modified icons/obj/cryogenics_split.dmi
Binary file not shown.
Binary file added icons/obj/machinery/sleeper.dmi
Binary file not shown.
Binary file removed icons/obj/sleeper.dmi
Binary file not shown.
Binary file removed icons/obj/stasis_bed.dmi
Binary file not shown.
6 changes: 3 additions & 3 deletions maps/away/away_site/sol_bunker/bunker.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions maps/dungeon_spawns/coc_ship_unique.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
4 changes: 2 additions & 2 deletions maps/dungeon_spawns/sol_bunker_unique.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
Loading