From fa8e8decb4c0a7d50e110f9ccd67863462a92a07 Mon Sep 17 00:00:00 2001 From: Erthilo Date: Fri, 18 May 2012 00:56:53 +0100 Subject: [PATCH] Made rollerbeds collapsible. They don't fit in containers, so it's just easier to take to location. Added new sprites and sounds for cable cuffs, and new sounds for table smashy. --- code/defines/obj/weapon.dm | 1 + .../machinery/computer/HolodeckControl.dm | 4 +-- code/game/objects/items.dm | 10 +++++-- code/game/objects/stool.dm | 25 ++++++++++++++++++ code/game/objects/tables_racks.dm | 2 +- code/modules/mob/living/carbon/human/human.dm | 5 ++-- html/changelog.html | 16 +++++++++++ icons/mob/mob.dmi | Bin 190981 -> 193213 bytes icons/obj/items.dmi | Bin 57313 -> 58555 bytes icons/obj/rollerbed.dmi | Bin 1574 -> 1508 bytes sound/weapons/cablecuff.ogg | Bin 0 -> 6741 bytes sound/weapons/tablehit1.ogg | Bin 0 -> 13158 bytes 12 files changed, 56 insertions(+), 7 deletions(-) create mode 100644 sound/weapons/cablecuff.ogg create mode 100644 sound/weapons/tablehit1.ogg diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm index 3e8f5a46c06..39b66e92b0f 100644 --- a/code/defines/obj/weapon.dm +++ b/code/defines/obj/weapon.dm @@ -912,6 +912,7 @@ /obj/item/weapon/handcuffs/cable name = "cable restraints" desc = "Looks like some cables tied together. Could be used to tie something up." + icon_state = "cuff_red" /obj/item/weapon/locator name = "locator" diff --git a/code/game/machinery/computer/HolodeckControl.dm b/code/game/machinery/computer/HolodeckControl.dm index ccc94d6fdbe..f0cb70659c3 100644 --- a/code/game/machinery/computer/HolodeckControl.dm +++ b/code/game/machinery/computer/HolodeckControl.dm @@ -371,7 +371,7 @@ "\red You hear a whine as \the [src]'s is hit by something dense.") H.UpdateDamageIcon() H.updatehealth() - playsound(src.loc, 'punch1.ogg', 50, 1, -3) + playsound(src.loc, 'tablehit1.ogg', 50, 1, -3) else //Lets do REAL DAMAGE, YEAH! G.affecting.attack_log += text("\[[time_stamp()]\] Has been smashed on a table by [G.assailant.name] ([G.assailant.ckey])") G.assailant.attack_log += text("\[[time_stamp()]\] Smashed [G.affecting.name] ([G.affecting.ckey]) on a table.") @@ -409,7 +409,7 @@ "\red You hear the nauseating crunch of bone and gristle on solid metal.") H.UpdateDamageIcon() H.updatehealth() - playsound(src.loc, 'punch1.ogg', 50, 1, -3) + playsound(src.loc, 'tablehit1.ogg', 50, 1, -3) return G.affecting.loc = src.loc G.affecting.Weaken(5) diff --git a/code/game/objects/items.dm b/code/game/objects/items.dm index 3993a1e2acf..fbaf1ff3d6b 100644 --- a/code/game/objects/items.dm +++ b/code/game/objects/items.dm @@ -63,7 +63,10 @@ O.place = "handcuff" M.requests += O spawn( 0 ) - playsound(src.loc, 'handcuffs.ogg', 30, 1, -2) + if(istype(src, /obj/item/weapon/handcuffs/cable)) + playsound(src.loc, 'cablecuff.ogg', 30, 1, -2) + else + playsound(src.loc, 'handcuffs.ogg', 30, 1, -2) O.process() return else @@ -77,7 +80,10 @@ O.place = "handcuff" M.requests += O spawn( 0 ) - playsound(src.loc, 'handcuffs.ogg', 30, 1, -2) + if(istype(src, /obj/item/weapon/handcuffs/cable)) + playsound(src.loc, 'cablecuff.ogg', 30, 1, -2) + else + playsound(src.loc, 'handcuffs.ogg', 30, 1, -2) O.process() return return diff --git a/code/game/objects/stool.dm b/code/game/objects/stool.dm index 1fffa4c72c0..3a2bb3f1a18 100644 --- a/code/game/objects/stool.dm +++ b/code/game/objects/stool.dm @@ -151,6 +151,18 @@ icon_state = "down" anchored = 0 +/obj/item/roller + name = "roller bed" + desc = "A collapsed roller bed that can be carried around." + icon = 'rollerbed.dmi' + icon_state = "folded" + w_class = 4.0 // Can't be put in backpacks. Oh well. + + attack_self(mob/user) + var/obj/structure/stool/bed/roller/R = new /obj/structure/stool/bed/roller(user.loc) + R.add_fingerprint(user) + del(src) + //obj/structure/stool/bed/roller/Move() /obj/structure/stool/bed/Move() ..() @@ -181,7 +193,20 @@ buckled_mob.pixel_y = 0 buckled_mob.anchored = 0 buckled_mob.buckled = null + buckled_mob = null density = 0 icon_state = "down" ..() return + +/obj/structure/stool/bed/roller/MouseDrop(over_object, src_location, over_location) + ..() + if((over_object == usr && (in_range(src, usr) || usr.contents.Find(src)))) + if(!ishuman(usr)) return + if(buckled_mob) return 0 + visible_message("[usr] collapses \the [src.name]") + new/obj/item/roller(get_turf(src)) + spawn(0) + del(src) + return + diff --git a/code/game/objects/tables_racks.dm b/code/game/objects/tables_racks.dm index 86e02346fd4..f41e750df34 100644 --- a/code/game/objects/tables_racks.dm +++ b/code/game/objects/tables_racks.dm @@ -189,7 +189,7 @@ TABLE AND RACK OBJECT INTERATIONS "\red You hear the nauseating crunch of bone and gristle on solid metal.") H.UpdateDamageIcon() H.updatehealth() - playsound(src.loc, 'punch1.ogg', 50, 1, -3) + playsound(src.loc, 'tablehit1.ogg', 50, 1, -3) return G.affecting.loc = src.loc G.affecting.Weaken(5) diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm index ea4ab718da3..7a057f2b826 100644 --- a/code/modules/mob/living/carbon/human/human.dm +++ b/code/modules/mob/living/carbon/human/human.dm @@ -1208,10 +1208,11 @@ if (handcuffed) pulling = null + var/h1 = handcuffed.icon_state if (!lying) - overlays += image("icon" = 'mob.dmi', "icon_state" = "handcuff1", "layer" = MOB_LAYER) + overlays += image("icon" = 'mob.dmi', "icon_state" = "[h1]1", "layer" = MOB_LAYER) else - overlays += image("icon" = 'mob.dmi', "icon_state" = "handcuff2", "layer" = MOB_LAYER) + overlays += image("icon" = 'mob.dmi', "icon_state" = "[h1]2", "layer" = MOB_LAYER) if (client) client.screen -= contents diff --git a/html/changelog.html b/html/changelog.html index 5592d0b29a7..675c3d72fc4 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -49,8 +49,24 @@ should be listed in the changelog upon commit though. Thanks. -->

17 May 2012

+

TG updated:

+

Erthilo updated: