diff --git a/code/game/objects/items/bodybag.dm b/code/game/objects/items/bodybag.dm index 6c5601568c4..c9ce5efa087 100644 --- a/code/game/objects/items/bodybag.dm +++ b/code/game/objects/items/bodybag.dm @@ -84,14 +84,7 @@ src.name = "body bag - " src.name += t playsound(src, pick('sound/bureaucracy/pen1.ogg','sound/bureaucracy/pen2.ogg'), 20) - if(istype(buckled_to, /obj/structure/bed/roller)) - var/obj/structure/bed/roller/R = buckled_to - if(R.bag_strap) - LAZYREMOVE(overlays, image(R.icon, R.bag_strap)) - LAZYADD(overlays, image(icon, "bodybag_label")) - LAZYADD(overlays, image(R.icon, R.bag_strap)) - else - LAZYADD(overlays, image(icon, "bodybag_label")) + LAZYADD(overlays, image(icon, "bodybag_label")) else src.name = "body bag" return TRUE diff --git a/code/game/objects/structures/stool_bed_chair_nest/bed.dm b/code/game/objects/structures/stool_bed_chair_nest/bed.dm index c0510cb0efa..5cb7015690e 100644 --- a/code/game/objects/structures/stool_bed_chair_nest/bed.dm +++ b/code/game/objects/structures/stool_bed_chair_nest/bed.dm @@ -353,7 +353,6 @@ var/iv_attached = 0 var/iv_stand = TRUE var/patient_shift = 9 //How much are mobs moved up when they are buckled_to. - var/bag_strap = "standard_straps" slowdown = 0 /obj/structure/bed/roller/Initialize() @@ -386,8 +385,6 @@ if(vitals) vitals.update_monitor() vis_contents += vitals - if(bag_strap && istype(buckled, /obj/structure/closet/body_bag)) - LAZYADD(buckled.overlays, image(icon, bag_strap)) /obj/structure/bed/roller/attackby(obj/item/I, mob/user) if(iswrench(I) || istype(I, /obj/item/stack) || iswirecutter(I)) @@ -513,8 +510,6 @@ M.old_y = 0 if(iv_attached) detach_iv(M, usr) - else - LAZYREMOVE(MA.overlays, image(icon, bag_strap)) //Remove straps density = FALSE MA.pixel_y = 0 update_icon() @@ -527,7 +522,6 @@ makes_rolling_sound = FALSE held_item = /obj/item/roller/hover patient_shift = 6 - bag_strap = null /obj/structure/bed/roller/hover/Initialize() .=..() @@ -537,12 +531,9 @@ name = "roller bed" desc = "A collapsed roller bed that can be carried around." icon = 'icons/obj/rollerbed.dmi' - item_icons = list( - slot_l_hand_str = 'icons/mob/items/lefthand_medical.dmi', - slot_r_hand_str = 'icons/mob/items/righthand_medical.dmi' - ) icon_state = "standard_folded" - item_state = "rollerbed" + item_state = "rbed" + contained_sprite = TRUE drop_sound = 'sound/items/drop/axe.ogg' pickup_sound = 'sound/items/pickup/axe.ogg' center_of_mass = list("x" = 17,"y" = 7) @@ -553,6 +544,7 @@ name = "medical hoverbed" desc = "A collapsed hoverbed that can be carried around." icon_state = "hover_folded" + item_state = "rbed_hover" origin_type = /obj/structure/bed/roller/hover /obj/item/roller/attack_self(mob/user) diff --git a/html/changelogs/wezzy_newrollerbed.yml b/html/changelogs/wezzy_newrollerbed.yml new file mode 100644 index 00000000000..f8809e904f3 --- /dev/null +++ b/html/changelogs/wezzy_newrollerbed.yml @@ -0,0 +1,41 @@ +################################ +# 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: 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, 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: + - imageadd: "Adds new sprites, rollerbed from Bay and vitals monitor modified from /tg/." \ No newline at end of file diff --git a/icons/mob/items/lefthand_medical.dmi b/icons/mob/items/lefthand_medical.dmi index ea357e70637..5646e613eb1 100644 Binary files a/icons/mob/items/lefthand_medical.dmi and b/icons/mob/items/lefthand_medical.dmi differ diff --git a/icons/mob/items/righthand_medical.dmi b/icons/mob/items/righthand_medical.dmi index 1f5ee054982..6e4e542d4d3 100644 Binary files a/icons/mob/items/righthand_medical.dmi and b/icons/mob/items/righthand_medical.dmi differ diff --git a/icons/obj/contained_items/tools/vitals_monitor.dmi b/icons/obj/contained_items/tools/vitals_monitor.dmi index a8eb1df4897..e056048c931 100644 Binary files a/icons/obj/contained_items/tools/vitals_monitor.dmi and b/icons/obj/contained_items/tools/vitals_monitor.dmi differ diff --git a/icons/obj/rollerbed.dmi b/icons/obj/rollerbed.dmi index 4d63e5409d7..6b576f7be7d 100644 Binary files a/icons/obj/rollerbed.dmi and b/icons/obj/rollerbed.dmi differ