From b67bfc8edc326efb7502df2fae448fc5ed695b56 Mon Sep 17 00:00:00 2001 From: Ren Erthilo Date: Thu, 26 Apr 2012 22:50:50 +0100 Subject: [PATCH] TG: Fixes tensioner values having one too many zeros in it. Adds deathsquad, ninja, and aliens to actually working tensioner options. Fixes deathsquad radios Disables the requirement on the deathsquad shuttle for the sent_stike_team var to have been set Fixes the syndicate shuttle position on the map being a little too short. (It's never been used, has it?) Revision: r3276 Author: VivianFoxfoo --- code/game/syndicate_specops_shuttle.dm | 8 ++++---- code/modules/admin/verbs/diagnostics.dm | 8 ++++++++ code/modules/admin/verbs/striketeam_syndicate.dm | 3 ++- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/code/game/syndicate_specops_shuttle.dm b/code/game/syndicate_specops_shuttle.dm index 2bef199b1c2..8dbfb79ba2a 100644 --- a/code/game/syndicate_specops_shuttle.dm +++ b/code/game/syndicate_specops_shuttle.dm @@ -29,7 +29,7 @@ var/syndicate_elite_shuttle_timeleft = 0 if(announcer) announcer.say(message) // message = "ARMORED SQUAD TAKE YOUR POSITION ON GRAVITY LAUNCH PAD" - announcer.say(message) + // announcer.say(message) while(syndicate_elite_shuttle_time - world.timeofday > 0) var/ticksleft = syndicate_elite_shuttle_time - world.timeofday @@ -192,9 +192,9 @@ var/syndicate_elite_shuttle_timeleft = 0 user << "\red Access Denied." return - if (sent_syndicate_strike_team == 0) - usr << "\red The strike team has not yet deployed." - return +// if (sent_syndicate_strike_team == 0) +// usr << "\red The strike team has not yet deployed." +// return if(..()) return diff --git a/code/modules/admin/verbs/diagnostics.dm b/code/modules/admin/verbs/diagnostics.dm index 3085e77bdb2..ebce8059bd9 100644 --- a/code/modules/admin/verbs/diagnostics.dm +++ b/code/modules/admin/verbs/diagnostics.dm @@ -82,6 +82,7 @@ usr << "\blue @[target.x],[target.y] ([GM.group_multiplier]): O:[GM.oxygen] T:[GM.toxins] N:[GM.nitrogen] C:[GM.carbon_dioxide] w [GM.temperature] Kelvin, [GM.return_pressure()] kPa [(burning)?("\red BURNING"):(null)]" for(var/datum/gas/trace_gas in GM.trace_gases) usr << "[trace_gas.type]: [trace_gas.moles]" + //feedback_add_details("admin_verb","DAST") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! fix_next_move() set category = "Debug" @@ -213,6 +214,12 @@ alert(usr,"No players found. How the fuck are you calling this?","Tension Report") return 0 + var/numghosts = 0 + + for(var/mob/dead/observer/theghost in world) + numghosts ++ + + var/output = {"TENSION REPORT
General Statistics
Deaths: [tension_master.deaths]
@@ -220,6 +227,7 @@ Explosions: [tension_master.explosions]
Air alarms: [tension_master.air_alarms]
Adminhelps: [tension_master.adminhelps]
+Ghosts: [numghosts]

Current Status
Tension: [tension_master.score]
diff --git a/code/modules/admin/verbs/striketeam_syndicate.dm b/code/modules/admin/verbs/striketeam_syndicate.dm index eccd7ea42af..8dc10f4da03 100644 --- a/code/modules/admin/verbs/striketeam_syndicate.dm +++ b/code/modules/admin/verbs/striketeam_syndicate.dm @@ -107,6 +107,7 @@ var/global/sent_syndicate_strike_team = 0 message_admins("\blue [key_name_admin(usr)] has spawned a Syndicate strike squad.", 1) log_admin("[key_name(usr)] used Spawn Syndicate Squad.") + //feedback_add_details("admin_verb","SDTHS") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! /client/proc/create_syndicate_death_commando(obj/spawn_location, syndicate_leader_selected = 0) var/mob/living/carbon/human/new_syndicate_commando = new(spawn_location.loc) @@ -144,7 +145,7 @@ var/global/sent_syndicate_strike_team = 0 camera.c_tag = real_name var/obj/item/device/radio/R = new /obj/item/device/radio/headset(src) - R.set_frequency(1337) //Same frequency as the syndicate team in Nuke mode. + R.set_frequency(SYND_FREQ) //Same frequency as the syndicate team in Nuke mode. equip_if_possible(R, slot_ears) equip_if_possible(new /obj/item/clothing/under/syndicate(src), slot_w_uniform) equip_if_possible(new /obj/item/clothing/shoes/swat(src), slot_shoes)