From e2b21ce916d5f8a623470ae3f1d3334ce28b669b Mon Sep 17 00:00:00 2001 From: Ren Erthilo Date: Tue, 1 May 2012 14:09:47 +0100 Subject: [PATCH] TG: Runtime fix for paint Shuttle call/recall announcements are now more noticeable. Removed a few ways they could be spammed. Cats and Dogs can see in the dark. Recommitted some of the poop stuff by Doohl because, hell it's only one day and I don't hate fun. Revision: r3382 Author: elly1...@rocketmail.com Date: Mar 31, 2012 --- baystation12.dme | 1 + code/datums/shuttle_controller.dm | 5 ++--- code/defines/procs/captain_announce.dm | 3 +-- code/game/machinery/computer/communications.dm | 14 +++++++------- code/game/objects/items/weapons/paint.dm | 3 ++- code/modules/admin/admin.dm | 6 +++--- code/modules/admin/verbs/randomverbs.dm | 2 +- code/modules/admin/verbs/striketeam.dm | 2 +- code/modules/mob/living/silicon/ai/death.dm | 2 +- code/modules/mob/simple_animal/cat.dm | 1 + code/modules/mob/simple_animal/corgi.dm | 7 ++----- 11 files changed, 22 insertions(+), 24 deletions(-) diff --git a/baystation12.dme b/baystation12.dme index c5b3ba17988..0afd6cbf197 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -544,6 +544,7 @@ #include "code\game\machinery\computer\lockdown.dm" #include "code\game\machinery\computer\medical.dm" #include "code\game\machinery\computer\Operating.dm" +#include "code\game\machinery\computer\pod.dm" #include "code\game\machinery\computer\power.dm" #include "code\game\machinery\computer\prisoner.dm" #include "code\game\machinery\computer\robot.dm" diff --git a/code/datums/shuttle_controller.dm b/code/datums/shuttle_controller.dm index ffeee9807bd..9fc5cc19910 100644 --- a/code/datums/shuttle_controller.dm +++ b/code/datums/shuttle_controller.dm @@ -47,9 +47,8 @@ datum/shuttle_controller if(direction == 1) var/timeleft = timeleft() if(timeleft >= 600) - world << "\blue Shuttle is at Centcom. Unable to recall." return - world << "\blue Alert: The shuttle is going back!" + captain_announce("The emergency shuttle has been recalled.") world << sound('shuttlerecalled.ogg') setdirection(-1) online = 1 @@ -192,7 +191,7 @@ datum/shuttle_controller start_location.move_contents_to(end_location) settimeleft(SHUTTLELEAVETIME) - world << "The Emergency Shuttle has docked with the station. You have [timeleft()/60] minutes to board the Emergency Shuttle." + captain_announce("The Emergency Shuttle has docked with the station. You have [timeleft()/60] minutes to board the Emergency Shuttle.") world << sound('shuttledock.ogg') return 1 diff --git a/code/defines/procs/captain_announce.dm b/code/defines/procs/captain_announce.dm index 4ca05959371..9b91705ea56 100644 --- a/code/defines/procs/captain_announce.dm +++ b/code/defines/procs/captain_announce.dm @@ -1,6 +1,5 @@ /proc/captain_announce(var/text) - world << "

Captain Announces

" - + world << "

Priority Announcement

" world << "[html_encode(text)]" world << "
" diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index b8825a56162..c17eaf8b597 100644 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -470,7 +470,7 @@ emergency_shuttle.incall() log_game("[key_name(user)] has called the shuttle.") message_admins("[key_name_admin(user)] has called the shuttle.", 1) - world << "\blue Alert: The emergency shuttle has been called. It will arrive in [round(emergency_shuttle.timeleft()/60)] minutes." + captain_announce("The emergency shuttle has been called. It will arrive in [round(emergency_shuttle.timeleft()/60)] minutes.") world << sound('shuttlecalled.ogg') return @@ -482,10 +482,10 @@ if((ticker.mode.name == "blob")||(ticker.mode.name == "meteor")) return - emergency_shuttle.recall() - log_game("[key_name(user)] has uncalled the shuttle.") - message_admins("[key_name_admin(user)] has uncalled the shuttle.", 1) - + if(emergency_shuttle.direction != -1 && emergency_shuttle.online) //check that shuttle isn't already heading to centcomm + emergency_shuttle.recall() + log_game("[key_name(user)] has recalled the shuttle.") + message_admins("[key_name_admin(user)] has recalled the shuttle.", 1) return /obj/machinery/computer/communications/proc/post_status(var/command, var/data1, var/data2) @@ -529,7 +529,7 @@ emergency_shuttle.incall(2) log_game("All the AIs, comm consoles and boards are destroyed. Shuttle called.") message_admins("All the AIs, comm consoles and boards are destroyed. Shuttle called.", 1) - world << "\blue Alert: The emergency shuttle has been called. It will arrive in [round(emergency_shuttle.timeleft()/60)] minutes." + captain_announce("The emergency shuttle has been called. It will arrive in [round(emergency_shuttle.timeleft()/60)] minutes.") world << sound('shuttlecalled.ogg') ..() @@ -554,7 +554,7 @@ emergency_shuttle.incall(2) log_game("All the AIs, comm consoles and boards are destroyed. Shuttle called.") message_admins("All the AIs, comm consoles and boards are destroyed. Shuttle called.", 1) - world << "\blue Alert: The emergency shuttle has been called. It will arrive in [round(emergency_shuttle.timeleft()/60)] minutes." + captain_announce("The emergency shuttle has been called. It will arrive in [round(emergency_shuttle.timeleft()/60)] minutes.") world << sound('shuttlecalled.ogg') ..() \ No newline at end of file diff --git a/code/game/objects/items/weapons/paint.dm b/code/game/objects/items/weapons/paint.dm index fc1d7a39bbd..3e92b39a56a 100644 --- a/code/game/objects/items/weapons/paint.dm +++ b/code/game/objects/items/weapons/paint.dm @@ -70,7 +70,7 @@ var/global/list/cached_icons = list() desc = "Used to recolor floors and walls. Can not be removed by the janitor." icon = 'items.dmi' icon_state = "paint_neutral" - var/color = "neutral" + var/color = "FFFFFF" item_state = "paintcan" w_class = 3.0 @@ -109,6 +109,7 @@ var/global/list/cached_icons = list() color = "FFFFFF" icon_state = "paint_white" + /obj/item/weapon/paint/anycolor name = "Any color" icon_state = "paint_neutral" diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index ae74953440c..e1e8fd34101 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -31,7 +31,7 @@ var/global/BSACooldown = 0 if ((!( ticker ) || emergency_shuttle.location)) return emergency_shuttle.incall() - world << "\blue Alert: The emergency shuttle has been called. It will arrive in [round(emergency_shuttle.timeleft()/60)] minutes." + captain_announce("The emergency shuttle has been called. It will arrive in [round(emergency_shuttle.timeleft()/60)] minutes.") log_admin("[key_name(usr)] called the Emergency Shuttle") message_admins("\blue [key_name_admin(usr)] called the Emergency Shuttle to the station", 1) @@ -41,12 +41,11 @@ var/global/BSACooldown = 0 switch(emergency_shuttle.direction) if(-1) emergency_shuttle.incall() - world << "\blue Alert: The emergency shuttle has been called. It will arrive in [round(emergency_shuttle.timeleft()/60)] minutes." + captain_announce("The emergency shuttle has been called. It will arrive in [round(emergency_shuttle.timeleft()/60)] minutes.") log_admin("[key_name(usr)] called the Emergency Shuttle") message_admins("\blue [key_name_admin(usr)] called the Emergency Shuttle to the station", 1) if(1) emergency_shuttle.recall() - world << "\blue Alert: The shuttle is going back!" log_admin("[key_name(usr)] sent the Emergency Shuttle back") message_admins("\blue [key_name_admin(usr)] sent the Emergency Shuttle back", 1) @@ -59,6 +58,7 @@ var/global/BSACooldown = 0 if (src.rank in list("Badmin", "Game Admin", "Game Master")) emergency_shuttle.settimeleft( input("Enter new shuttle duration (seconds):","Edit Shuttle Timeleft", emergency_shuttle.timeleft() ) as num ) log_admin("[key_name(usr)] edited the Emergency Shuttle's timeleft to [emergency_shuttle.timeleft()]") + captain_announce("The emergency shuttle has been called. It will arrive in [round(emergency_shuttle.timeleft()/60)] minutes.") message_admins("\blue [key_name_admin(usr)] edited the Emergency Shuttle's timeleft to [emergency_shuttle.timeleft()]", 1) href_list["secretsadmin"] = "check_antagonist" else diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index 8eab8fbf6fd..d16e9aa2a84 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -780,7 +780,7 @@ Traitors and the like can also be revived with the previous role mostly intact. return emergency_shuttle.incall() - world << "\blue Alert: The emergency shuttle has been called. It will arrive in [round(emergency_shuttle.timeleft()/60)] minutes." + captain_announce("The emergency shuttle has been called. It will arrive in [round(emergency_shuttle.timeleft()/60)] minutes.") world << sound('shuttlecalled.ogg') //feedback_add_details("admin_verb","CSHUT") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! return diff --git a/code/modules/admin/verbs/striketeam.dm b/code/modules/admin/verbs/striketeam.dm index d55c862962f..2b6d2adcbe3 100644 --- a/code/modules/admin/verbs/striketeam.dm +++ b/code/modules/admin/verbs/striketeam.dm @@ -37,7 +37,6 @@ var/global/sent_strike_team = 0 if (emergency_shuttle.direction == 1 && emergency_shuttle.online == 1) emergency_shuttle.recall() - world << "\blue Alert: The shuttle is going back!" var/commando_number = commandos_possible //for selecting a leader var/leader_selected = 0 //when the leader is chosen. The last person spawned. @@ -186,6 +185,7 @@ var/global/sent_strike_team = 0 L.implanted = 1 + var/obj/item/weapon/card/id/W = new(src) W.name = "[real_name]'s ID Card" W.icon_state = "centcom" diff --git a/code/modules/mob/living/silicon/ai/death.dm b/code/modules/mob/living/silicon/ai/death.dm index ce640fc219f..79c4a7783c4 100644 --- a/code/modules/mob/living/silicon/ai/death.dm +++ b/code/modules/mob/living/silicon/ai/death.dm @@ -34,7 +34,7 @@ emergency_shuttle.incall(2) log_game("All the AIs, comm consoles and boards are destroyed. Shuttle called.") message_admins("All the AIs, comm consoles and boards are destroyed. Shuttle called.", 1) - world << "\blue Alert: The emergency shuttle has been called. It will arrive in [round(emergency_shuttle.timeleft()/60)] minutes." + captain_announce("The emergency shuttle has been called. It will arrive in [round(emergency_shuttle.timeleft()/60)] minutes.") world << sound('shuttlecalled.ogg') if(explosive) diff --git a/code/modules/mob/simple_animal/cat.dm b/code/modules/mob/simple_animal/cat.dm index 18c06a62a2b..f75db3dc16f 100644 --- a/code/modules/mob/simple_animal/cat.dm +++ b/code/modules/mob/simple_animal/cat.dm @@ -12,6 +12,7 @@ emote_see = list("shakes its head", "shivers") speak_chance = 1 turns_per_move = 5 + see_in_dark = 6 meat_type = /obj/item/weapon/reagent_containers/food/snacks/sliceable/meat response_help = "pets the" response_disarm = "gently pushes aside the" diff --git a/code/modules/mob/simple_animal/corgi.dm b/code/modules/mob/simple_animal/corgi.dm index 2cf1138d779..a6e7e687a2f 100644 --- a/code/modules/mob/simple_animal/corgi.dm +++ b/code/modules/mob/simple_animal/corgi.dm @@ -18,6 +18,7 @@ response_help = "pets the" response_disarm = "gently pushes aside the" response_harm = "kicks the" + see_in_dark = 5 var/obj/item/inventory_head var/obj/item/inventory_back var/obj/item/inventory_mouth @@ -392,8 +393,4 @@ dir = i sleep(1) else - ..() - -/obj/item/weapon/reagent_containers/food/snacks/sliceable/meat/corgi - name = "Corgi meat" - desc = "Tastes like... well you know..." \ No newline at end of file + ..() \ No newline at end of file