cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-24 00:51:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

You see me rollin' 2 - Deja Vu Edition - More Roller Bed Tweaks (#17074)

Browse Source 
* You see me rollin' 2 - Deja Vu Edition - More Roller Bed Tweaks

* Done.

* Not done. Awaiting second pass of sprites.

* Colour feedback

* NT Colours

Final design, as chosen by the medical discord

* Update bed.dm

* Maybe CI Won't Fail This Time?

* Learn to read

* Update code/game/objects/structures/stool_bed_chair_nest/bed.dm

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>

---------

Co-authored-by: Fluffy <65877598+FluffyGhoster@users.noreply.github.com>
This commit is contained in:
Sparky
2023-08-20 23:22:12 +01:00
committed by GitHub
parent e9a2100e62
commit 1a024e3a30
4 changed files with 30 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
code/game/objects/structures/stool_bed_chair_nest/bed.dm
View File

@@ -373,6 +373,7 @@
var/iv_attached = 0
var/iv_stand = TRUE
var/iv_transfer_rate = 4 //Same as max for regular IV drips
var/has_iv_light = TRUE
//Items that can be attached to an IV
var/list/accepted_containers = list(
/obj/item/reagent_containers/blood,
@@ -394,7 +395,10 @@
cut_overlays()
vis_contents = list()
if(density)
icon_state = "[base_icon]_up"
if(anchored)
icon_state = "[base_icon]_br"
else
icon_state = "[base_icon]_up"
else
icon_state = "[base_icon]_down"
if(beaker)
@@ -406,8 +410,11 @@
if(percentage < 25)
iv.add_overlay(image(icon, "light_low"))
if(density)
iv.pixel_y = 6
iv.pixel_y = 7
add_overlay(iv)
if(has_iv_light)
var/image/light = image(icon, "iv[iv_attached]_l")
add_overlay(light)
if(vitals)
vitals.update_monitor()
vis_contents += vitals
@@ -440,6 +447,12 @@
else
..()
/obj/structure/bed/roller/AltClick(mob/user)
if(density && !use_check_and_message(user))
anchored = !anchored
user.visible_message(SPAN_NOTICE("[user] [anchored ? "locks" : "releases"] \the [src]'s brakes."))
update_icon()
/obj/structure/bed/roller/proc/collapse()
usr.visible_message(SPAN_NOTICE("<b>[usr]</b> collapses \the [src]."), SPAN_NOTICE("You collapse \the [src]"))
new held_item(get_turf(src))
@@ -537,6 +550,7 @@
if(iv_attached)
detach_iv(M, usr)
density = FALSE
anchored = FALSE
MA.pixel_y = 0
update_icon()
@@ -547,7 +561,7 @@
base_icon = "hover"
makes_rolling_sound = FALSE
held_item = /obj/item/roller/hover
patient_shift = 6
has_iv_light = FALSE
/obj/structure/bed/roller/hover/Initialize()
.=..()
@@ -580,10 +594,12 @@
/obj/item/roller/afterattack(obj/target, mob/user, proximity)
if(!proximity)
return
if(isturf(target))
var/turf/T = target
var/turf/T = target
if(is_type_in_list(target, list(/obj/effect, /obj/structure/lattice)))
T = get_turf(target)
if(istype(T))
if(!T.density)
deploy_roller(user, target)
deploy_roller(user, T)
/obj/item/roller/attackby(obj/item/W as obj, mob/user as mob)
if(istype(W,/obj/item/roller_holder))