From 3192323c19fbe64e2f47e3cff6b4ed98d3655155 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Sat, 29 Jun 2013 16:57:08 -0700 Subject: [PATCH 1/4] Fixes #3200 --- .../crates_lockers/closets/secure/security.dm | 1 + code/modules/clothing/under/ties.dm | 13 +++++++++++++ 2 files changed, 14 insertions(+) diff --git a/code/game/objects/structures/crates_lockers/closets/secure/security.dm b/code/game/objects/structures/crates_lockers/closets/secure/security.dm index d0bb19bbd57..3ece4bfd1f1 100644 --- a/code/game/objects/structures/crates_lockers/closets/secure/security.dm +++ b/code/game/objects/structures/crates_lockers/closets/secure/security.dm @@ -154,6 +154,7 @@ new /obj/item/weapon/reagent_containers/spray/pepper(src) new /obj/item/weapon/melee/baton(src) new /obj/item/weapon/gun/energy/taser(src) + new /obj/item/weapon/storage/box/holobadge(src) return diff --git a/code/modules/clothing/under/ties.dm b/code/modules/clothing/under/ties.dm index 1874dd1b7b5..4e22b9a0bda 100644 --- a/code/modules/clothing/under/ties.dm +++ b/code/modules/clothing/under/ties.dm @@ -290,3 +290,16 @@ /obj/item/clothing/tie/holobadge/attack(mob/living/carbon/human/M, mob/living/user) if(isliving(user)) user.visible_message("\red [user] invades [M]'s personal space, thrusting [src] into their face insistently.","\red You invade [M]'s personal space, thrusting [src] into their face insistently. You are the law.") + +/obj/item/weapon/storage/box/holobadge + name = "holobadge box" + desc = "A box claiming to contain holobadges." + New() + new /obj/item/clothing/tie/holobadge(src) + new /obj/item/clothing/tie/holobadge(src) + new /obj/item/clothing/tie/holobadge(src) + new /obj/item/clothing/tie/holobadge(src) + new /obj/item/clothing/tie/holobadge/cord(src) + new /obj/item/clothing/tie/holobadge/cord(src) + ..() + return \ No newline at end of file From 60eeccd2ed44b2508c3a8f23e21ddbf119fbe195 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Sat, 29 Jun 2013 17:27:46 -0700 Subject: [PATCH 2/4] Fixes #3198 --- .../mob/living/carbon/monkey/monkey.dm | 3 ++- .../mob/living/carbon/monkey/update_icons.dm | 4 ++-- icons/mob/monkey.dmi | Bin 26123 -> 26121 bytes 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/code/modules/mob/living/carbon/monkey/monkey.dm b/code/modules/mob/living/carbon/monkey/monkey.dm index 3b0240fe39c..ecd799b5277 100644 --- a/code/modules/mob/living/carbon/monkey/monkey.dm +++ b/code/modules/mob/living/carbon/monkey/monkey.dm @@ -10,6 +10,7 @@ update_icon = 0 ///no need to call regenerate_icon var/obj/item/weapon/card/id/wear_id = null // Fix for station bounced radios -- Skie + /mob/living/carbon/monkey/tajara name = "farwa" voice_name = "farwa" @@ -28,7 +29,7 @@ voice_name = "stok" voice_message = "hisses" say_message = "hisses" - icon_state = "stok1" + icon_state = "stokkey1" /mob/living/carbon/monkey/unathi/New() var/datum/reagents/R = new/datum/reagents(1000) diff --git a/code/modules/mob/living/carbon/monkey/update_icons.dm b/code/modules/mob/living/carbon/monkey/update_icons.dm index c6895db0070..ffff64b06f8 100644 --- a/code/modules/mob/living/carbon/monkey/update_icons.dm +++ b/code/modules/mob/living/carbon/monkey/update_icons.dm @@ -33,9 +33,9 @@ if("tajaran") ico = "tajkey" if("lizard") - ico = "stok" + ico = "stokkey" if("skrell") - icon_state = "skrellkey" + ico = "skrellkey" if(lying) icon_state = ico + "0" for(var/image/I in overlays_lying) diff --git a/icons/mob/monkey.dmi b/icons/mob/monkey.dmi index 75ce4c4596d6015aa112132370584a6156a3e6dd..c0f5e306f26461b7a8248021de397da686a8ff47 100644 GIT binary patch delta 52 zcmV-40L%Z2%mIna0gxmC?Xe}*0U*Z`?m>pJi|8EBIia)GTk-n75R12E`5(xqxs9EJ KsEe~40`Ft43>zB& delta 54 zcmV-60LlM}%mItc0gxmC@3AG-0U}4+QVt!%)kSoUwY&p5YrPe(?+dYbTbBO;_DHt- MP;f7Cvl;^LW0b=fy#N3J From e87348dd8d1e95f75e1d08a6a67c1d3e2331e5f0 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Sat, 29 Jun 2013 17:56:38 -0700 Subject: [PATCH 3/4] Quickfix for #3194 --- code/modules/mob/living/silicon/robot/robot.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index ace234eb7c2..2686bc49885 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -698,7 +698,7 @@ for(var/V in components) if(V == "power cell") continue var/datum/robot_component/C = components[V] - if(C.installed == 1) + if(C.installed == 1 || C.installed == -1) removable_components += V var/remove = input(user, "Which component do you want to pry out?", "Remove Component") as null|anything in removable_components From 6fc787ff7345337389d21c2d504b64d67ea25c98 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Sat, 29 Jun 2013 18:09:35 -0700 Subject: [PATCH 4/4] Fixes #3201 --- code/game/objects/items/bodybag.dm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/bodybag.dm b/code/game/objects/items/bodybag.dm index ba63563d7c5..0bc84c57ec7 100644 --- a/code/game/objects/items/bodybag.dm +++ b/code/game/objects/items/bodybag.dm @@ -74,7 +74,10 @@ if(opened) return 0 if(contents.len) return 0 visible_message("[usr] folds up the [src.name]") - new/obj/item/bodybag(get_turf(src)) + if(istype(src,/obj/structure/closet/body_bag/cryobag)) + new/obj/item/bodybag/cryobag(get_turf(src)) + else + new/obj/item/bodybag(get_turf(src)) spawn(0) del(src) return @@ -92,7 +95,6 @@ icon = 'icons/obj/cryobag.dmi' icon_state = "bodybag_folded" - attack_self(mob/user) var/obj/structure/closet/body_bag/cryobag/R = new /obj/structure/closet/body_bag/cryobag(user.loc) R.add_fingerprint(user)