From 6123c8421eba1b2443a40994a89560aef766296e Mon Sep 17 00:00:00 2001 From: RavingManiac Date: Mon, 4 May 2015 16:58:24 +1000 Subject: [PATCH 1/4] Intent menu appears on zoom --- code/_onclick/hud/hud.dm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/code/_onclick/hud/hud.dm b/code/_onclick/hud/hud.dm index e9c5429dd2..22253450b7 100644 --- a/code/_onclick/hud/hud.dm +++ b/code/_onclick/hud/hud.dm @@ -259,11 +259,11 @@ datum/hud/New(mob/owner) if(!hud_used) usr << "\red This mob type does not use a HUD." return - + if(!ishuman(src)) usr << "\red Inventory hiding is currently only supported for human mobs, sorry." return - + if(!client) return if(client.view != world.view) return @@ -325,7 +325,7 @@ datum/hud/New(mob/owner) return if(client.view != world.view) return - + if(hud_used.hud_shown) hud_used.hud_shown = 0 if(src.hud_used.adding) @@ -337,6 +337,7 @@ datum/hud/New(mob/owner) if(src.hud_used.item_action_list) src.client.screen -= src.hud_used.item_action_list src.client.screen -= src.internals + src.client.screen += src.hud_used.action_intent //we want the intent swticher visible else hud_used.hud_shown = 1 if(src.hud_used.adding) From a35f2c0ad6f16a6d2059ef1280cdb15aedd3400d Mon Sep 17 00:00:00 2001 From: RavingManiac Date: Mon, 4 May 2015 17:03:37 +1000 Subject: [PATCH 2/4] Changelog update --- html/changelogs/RavingManiac-master.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/html/changelogs/RavingManiac-master.yml b/html/changelogs/RavingManiac-master.yml index 9d3ea70147..e3a031deec 100644 --- a/html/changelogs/RavingManiac-master.yml +++ b/html/changelogs/RavingManiac-master.yml @@ -2,4 +2,5 @@ author: RavingManiac delete-after: True changes: - - tweak: "Candles now burn for about 30 mintutes." + - tweak: "Candles now burn for about 30 minutes." + - tweak: "Intent menu now appears while zooming with a sniper rifle." From 7ff68f8757f0d6d6c1dbcc823b1abc943331e647 Mon Sep 17 00:00:00 2001 From: volas Date: Mon, 4 May 2015 12:10:59 +0300 Subject: [PATCH 3/4] Modification to 'cinematic' command --- code/modules/admin/verbs/cinematic.dm | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/code/modules/admin/verbs/cinematic.dm b/code/modules/admin/verbs/cinematic.dm index e21de8641d..a643b370fc 100644 --- a/code/modules/admin/verbs/cinematic.dm +++ b/code/modules/admin/verbs/cinematic.dm @@ -1,12 +1,17 @@ /client/proc/cinematic(var/cinematic as anything in list("explosion",null)) - set name = "cinematic" + set name = "Cinematic" set category = "Fun" set desc = "Shows a cinematic." // Intended for testing but I thought it might be nice for events on the rare occasion Feel free to comment it out if it's not wanted. - set hidden = 1 + + if(!check_rights(R_FUN)) + return + if(alert("Are you sure you want to run [cinematic]?","Confirmation","Yes","No")=="No") return if(!ticker) return switch(cinematic) if("explosion") + if(alert("The game will be over. Are you really sure?", "Confirmation" ,"Continue", "Cancel") == "Cancel") + return var/parameter = input(src,"station_missed = ?","Enter Parameter",0) as num var/override switch(parameter) @@ -15,4 +20,8 @@ if(0) override = input(src,"mode = ?","Enter Parameter",null) as anything in list("blob","mercenary","AI malfunction","no override") ticker.station_explosion_cinematic(parameter,override) + + log_admin("[key_name(src)] launched cinematic \"[cinematic]\"") + message_admins("[key_name_admin(src)] launched cinematic \"[cinematic]\"", 1) + return \ No newline at end of file From 33dde892e25bd75947f7b06ff5c5ee9ec10e4653 Mon Sep 17 00:00:00 2001 From: Kelenius Date: Mon, 4 May 2015 21:33:30 +0300 Subject: [PATCH 4/4] Fixes a few log-destroying lines --- code/game/gamemodes/gameticker.dm | 2 +- code/game/mecha/equipment/tools/tools.dm | 2 +- code/game/objects/effects/spiders.dm | 4 ++-- code/modules/mob/living/carbon/human/examine.dm | 8 ++++---- code/modules/projectiles/gun.dm | 4 ++-- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/code/game/gamemodes/gameticker.dm b/code/game/gamemodes/gameticker.dm index ad624aec9b..49b4b4ac98 100644 --- a/code/game/gamemodes/gameticker.dm +++ b/code/game/gamemodes/gameticker.dm @@ -432,7 +432,7 @@ var/global/datum/controller/gameticker/ticker robo.laws.show_laws(world) if(dronecount) - world << "There [dronecount>1 ? "were" : "was"] [dronecount] industrious maintenance [dronecount>1 ? "drones" : "drone"] at the end of this round." + world << "There [dronecount>1 ? "were" : "was"] [dronecount] industrious maintenance [dronecount>1 ? "drones" : "drone"] at the end of this round." mode.declare_completion()//To declare normal completion. diff --git a/code/game/mecha/equipment/tools/tools.dm b/code/game/mecha/equipment/tools/tools.dm index 130d8d89c8..b124c4c226 100644 --- a/code/game/mecha/equipment/tools/tools.dm +++ b/code/game/mecha/equipment/tools/tools.dm @@ -440,7 +440,7 @@ last_fired = world.time else if (world.time % 3) - occupant_message("[src] is not ready to fire again!") + occupant_message("[src] is not ready to fire again!") return 0 switch(mode) diff --git a/code/game/objects/effects/spiders.dm b/code/game/objects/effects/spiders.dm index 682347669a..60e3f1b44f 100644 --- a/code/game/objects/effects/spiders.dm +++ b/code/game/objects/effects/spiders.dm @@ -22,9 +22,9 @@ /obj/effect/spider/attackby(var/obj/item/weapon/W, var/mob/user) if(W.attack_verb.len) - visible_message("\red \The [src] have been [pick(W.attack_verb)] with \the [W][(user ? " by [user]." : ".")]") + visible_message("\The [src] have been [pick(W.attack_verb)] with \the [W][(user ? " by [user]." : ".")]") else - visible_message("\red \The [src] have been attacked with \the [W][(user ? " by [user]." : ".")]") + visible_message("\The [src] have been attacked with \the [W][(user ? " by [user]." : ".")]") var/damage = W.force / 4.0 diff --git a/code/modules/mob/living/carbon/human/examine.dm b/code/modules/mob/living/carbon/human/examine.dm index 3630d609a3..007f5a3552 100644 --- a/code/modules/mob/living/carbon/human/examine.dm +++ b/code/modules/mob/living/carbon/human/examine.dm @@ -384,14 +384,14 @@ else if(is_bleeding["right foot"]) display_shoes = 1 if(display_chest) - msg += "[src] has blood soaking through from under [t_his] clothing!\n" + msg += "[src] has blood soaking through from under [t_his] clothing!\n" if(display_shoes) - msg += "[src] has blood running from [t_his] shoes!\n" + msg += "[src] has blood running from [t_his] shoes!\n" if(display_gloves) - msg += "[src] has blood running from under [t_his] gloves!\n" + msg += "[src] has blood running from under [t_his] gloves!\n" for(var/implant in get_visible_implants(0)) - msg += "[src] has \a [implant] sticking out of [t_his] flesh!\n" + msg += "[src] has \a [implant] sticking out of [t_his] flesh!\n" if(digitalcamo) msg += "[t_He] [t_is] repulsively uncanny!\n" diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm index 4e81f77e96..9dceb44fb4 100644 --- a/code/modules/projectiles/gun.dm +++ b/code/modules/projectiles/gun.dm @@ -124,7 +124,7 @@ if (!ready_to_fire()) if (world.time % 3) //to prevent spam - user << "[src] is not ready to fire again!" + user << "[src] is not ready to fire again!" return var/obj/projectile = consume_next_projectile(user) @@ -170,7 +170,7 @@ if(reflex) user.visible_message( - "[user] fires [src][pointblank ? " point blank at [target]":""] by reflex!", + "[user] fires [src][pointblank ? " point blank at [target]":""] by reflex!", "You fire [src] by reflex]!", "You hear a [fire_sound_text]!" )