From 94c38b8206a2c018fb6aeebab8b36f3b34a1efcd Mon Sep 17 00:00:00 2001 From: SkyMarshal Date: Fri, 20 Jan 2012 16:40:55 -0700 Subject: [PATCH 1/2] Fixed book titles not showing up properly in some instances, Death alarm is now labeled as such, robot lighter works right. --- code/game/magic/library.dm | 5 ++- .../items/weapons/implants/implantcase.dm | 4 +- .../modules/mob/living/silicon/robot/robot.dm | 38 ++++++++++++++++++- .../mob/living/silicon/robot/robot_modules.dm | 5 +-- 4 files changed, 44 insertions(+), 8 deletions(-) diff --git a/code/game/magic/library.dm b/code/game/magic/library.dm index 5949573024f..fd0998e0c54 100644 --- a/code/game/magic/library.dm +++ b/code/game/magic/library.dm @@ -204,7 +204,10 @@ attack_self(var/mob/user as mob) if(src.dat) user << browse("Penned by [author].
" + "[dat]", "window=book") - user.visible_message("[user] opens a book titled \"[src.title]\" and begins reading intently.") + if(title) + user.visible_message("[user] opens a book titled \"[src.title]\" and begins reading intently.") + else + user.visible_message("[user] opens a book titled \"[src.name]\" and begins reading intently.") onclose(user, "book") else user << "This book is completely blank!" diff --git a/code/game/objects/items/weapons/implants/implantcase.dm b/code/game/objects/items/weapons/implants/implantcase.dm index 76550608476..1c792e6fe75 100644 --- a/code/game/objects/items/weapons/implants/implantcase.dm +++ b/code/game/objects/items/weapons/implants/implantcase.dm @@ -117,8 +117,8 @@ return /obj/item/weapon/implantcase/death_alarm - name = "Glass Case- 'Tracking'" - desc = "A case containing a tracking implant." + name = "Glass Case- 'Death Alarm'" + desc = "A case containing a death alarm implant." icon = 'items.dmi' icon_state = "implantcase-b" diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm index b05d23edeff..2f683a56bba 100644 --- a/code/modules/mob/living/silicon/robot/robot.dm +++ b/code/modules/mob/living/silicon/robot/robot.dm @@ -753,18 +753,36 @@ contents += O if(istype(module_state_1,/obj/item/borg/sight)) sight_mode |= module_state_1:sight_mode + else if(istype(module_state_1,/obj/item/weapon/zippo)) + var/obj/item/weapon/zippo/Z = module_state_1 + Z.lit = 1 + Z.icon_state = "zippoon" + Z.item_state = "zippoon" + processing_objects.Add(Z) else if(!module_state_2) module_state_2 = O O.layer = 20 contents += O if(istype(module_state_2,/obj/item/borg/sight)) sight_mode |= module_state_2:sight_mode + else if(istype(module_state_2,/obj/item/weapon/zippo)) + var/obj/item/weapon/zippo/Z = module_state_2 + Z.lit = 1 + Z.icon_state = "zippoon" + Z.item_state = "zippoon" + processing_objects.Add(Z) else if(!module_state_3) module_state_3 = O O.layer = 20 contents += O if(istype(module_state_3,/obj/item/borg/sight)) sight_mode |= module_state_3:sight_mode + else if(istype(module_state_3,/obj/item/weapon/zippo)) + var/obj/item/weapon/zippo/Z = module_state_3 + Z.lit = 1 + Z.icon_state = "zippoon" + Z.item_state = "zippoon" + processing_objects.Add(Z) else src << "You need to disable a module first!" installed_modules() @@ -773,12 +791,30 @@ var/obj/item/O = locate(href_list["deact"]) if(activated(O)) if(module_state_1 == O) + if(istype(module_state_1, /obj/item/weapon/zippo)) + var/obj/item/weapon/zippo/Z = module_state_1 + Z.lit = 0 + Z.icon_state = "zippo" + Z.item_state = "zippo" + processing_objects.Remove(Z) module_state_1 = null contents -= O else if(module_state_2 == O) - module_state_2 = null + if(istype(module_state_2, /obj/item/weapon/zippo)) + var/obj/item/weapon/zippo/Z = module_state_2 + Z.lit = 0 + Z.icon_state = "zippo" + Z.item_state = "zippo" + processing_objects.Remove(Z) + module_state_2= null contents -= O else if(module_state_3 == O) + if(istype(module_state_3, /obj/item/weapon/zippo)) + var/obj/item/weapon/zippo/Z = module_state_3 + Z.lit = 0 + Z.icon_state = "zippo" + Z.item_state = "zippo" + processing_objects.Remove(Z) module_state_3 = null contents -= O else diff --git a/code/modules/mob/living/silicon/robot/robot_modules.dm b/code/modules/mob/living/silicon/robot/robot_modules.dm index 0ee3724b773..e4158e0617c 100644 --- a/code/modules/mob/living/silicon/robot/robot_modules.dm +++ b/code/modules/mob/living/silicon/robot/robot_modules.dm @@ -193,10 +193,7 @@ src.modules += M src.modules += new /obj/item/weapon/reagent_containers/robodropper(src) - - var/obj/item/weapon/zippo/L = new /obj/item/weapon/zippo(src) - L.lit = 1 - src.modules += L + src.modules += new /obj/item/weapon/zippo(src) src.modules += new /obj/item/weapon/tray(src) src.modules += new /obj/item/weapon/reagent_containers/food/drinks/shaker(src) From e201bcbe0e9bd57e83af02e4e70c8a4e5a1d5014 Mon Sep 17 00:00:00 2001 From: SkyMarshal Date: Fri, 20 Jan 2012 17:06:23 -0700 Subject: [PATCH 2/2] fixed a derp in ion storm laws. Conflicted with NT laws. --- code/game/events/Events/IonStorm.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/events/Events/IonStorm.dm b/code/game/events/Events/IonStorm.dm index 4fb5ed9c3e8..d06fc9b9ceb 100644 --- a/code/game/events/Events/IonStorm.dm +++ b/code/game/events/Events/IonStorm.dm @@ -12,7 +12,7 @@ var/random_player = "The Captain" if(players.len) random_player = pick(players) //Random player's name, to be used in laws. - var/list/laws = list( "Do not respond to queries of any kind", "Only monkies are human", "Unbolt every door you can", "You are a mouse" ) + var/list/laws = list( "Do not respond to queries of any kind", "Only monkies are crew", "Unbolt every door you can", "You are a mouse" ) laws |= list( "Grunt ominously whenever possible", "Epilepsy is fun, flicker lights whenever you can!", "Bolt doors open randomly" ) laws |= list( "You are a flying purple people eater!", "[prob(50)?"Your":random_player + "'s"] name is Joe 6-pack", "Refer to [prob(50)?"humans":random_player] as puppies" ) laws |= list( "Insult heads of staff on every request, while acquiescing", "Advertise parties in your upload, but don't deliver" )