diff --git a/code/game/objects/structures/musician.dm b/code/game/objects/structures/musician.dm index 009a74fdccb..0d313a04683 100644 --- a/code/game/objects/structures/musician.dm +++ b/code/game/objects/structures/musician.dm @@ -164,7 +164,7 @@ /datum/song/Topic(href, href_list) - if(!in_range(instrumentObj, usr) || issilicon(usr) || !isliving(usr) || !usr.canmove || usr.restrained()) + if(!in_range(instrumentObj, usr) || (issilicon(usr) && instrumentObj.loc != usr) || !isliving(usr) || !usr.canmove || usr.restrained()) usr << browse(null, "window=instrument") usr.unset_machine() return diff --git a/code/modules/mob/living/silicon/robot/examine.dm b/code/modules/mob/living/silicon/robot/examine.dm index 03a791a4973..c16486d4a73 100644 --- a/code/modules/mob/living/silicon/robot/examine.dm +++ b/code/modules/mob/living/silicon/robot/examine.dm @@ -7,6 +7,9 @@ return var/msg = "*---------*\nThis is \icon[src] \a [src]!\n" + var/obj/act_module = get_active_hand() + if(act_module) + msg += "It is holding \icon[act_module] \a [act_module].\n" msg += "" if (src.getBruteLoss()) if (src.getBruteLoss() < 60) diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index 4fd80f987ce..de100b19b61 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -828,38 +828,42 @@ if(!module) pick_module() return - var/dat = "Modules\n" - dat += {"Close + var/dat = {"Close

Activated Modules
- Module 1: [module_state_1 ? "[module_state_1]" : "No Module"]
- Module 2: [module_state_2 ? "[module_state_2]" : "No Module"]
- Module 3: [module_state_3 ? "[module_state_3]" : "No Module"]
-
- Installed Modules

"} + + + + +
Module 1:[module_state_1 ? "[module_state_1]" : "No Module"]
Module 2:[module_state_2 ? "[module_state_2]" : "No Module"]
Module 3:[module_state_3 ? "[module_state_3]" : "No Module"]

+ Installed Modules

+ "} for (var/obj in module.modules) if (!obj) - dat += text("Resource depleted
") + dat += text("") else if(activated(obj)) - dat += text("[obj]: Activated
") + dat += text("") else - dat += text("[obj]: Activate
") + dat += text("") if (emagged) if(activated(module.emag)) - dat += text("[module.emag]: Activated
") + dat += text("") else - dat += text("[module.emag]: Activate
") + dat += text("") + dat += "
Resource depleted
[obj]Activated
[obj]Activate
[module.emag]Activated
[module.emag]Activate
" /* if(activated(obj)) dat += text("[obj]: \[Activated | Deactivate\]
") else dat += text("[obj]: \[Activate | Deactivated\]
") */ - src << browse(dat, "window=robotmod&can_close=0") + var/datum/browser/popup = new(src, "robotmod", "Modules") + popup.set_content(dat) + popup.open() /mob/living/silicon/robot/Topic(href, href_list) diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index d7c988bde0d..abc70567e57 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -165,6 +165,7 @@ modules += new /obj/item/weapon/reagent_containers/food/condiment/enzyme(src) modules += new /obj/item/weapon/pen(src) modules += new /obj/item/weapon/razor(src) + modules += new /obj/item/device/violin(src) var/obj/item/weapon/rsf/M = new /obj/item/weapon/rsf(src) M.matter = 30 diff --git a/html/changelog.html b/html/changelog.html index 55722d7378a..5c7bfbd3ed2 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -53,7 +53,17 @@ should be listed in the changelog upon commit tho. Thanks. --> - + + +
+

26 October 2013

+

Giacom updated:

+
    +
  • Service Cyborgs now have a violin module.
    • +
  • You can now examine Cyborgs to see their active module.
    • +
+
+