From 822c6e392309daed24c828dfa17fd63ab8f8eb1c Mon Sep 17 00:00:00 2001 From: cib Date: Thu, 19 Jan 2012 20:47:04 -0800 Subject: [PATCH 1/4] Changes related to the response team. - There's now a chance involved with the response team spawning. The more people are dead, and the more antagonists there are, the higher the chance will be. - You can now jobban people from the response team. --- code/game/response_team.dm | 35 +++++++++++++++++++++++++++++++++++ code/modules/admin/admin.dm | 7 +++++++ 2 files changed, 42 insertions(+) diff --git a/code/game/response_team.dm b/code/game/response_team.dm index daadaac5cf9..a0ec295cc2c 100644 --- a/code/game/response_team.dm +++ b/code/game/response_team.dm @@ -10,6 +10,9 @@ client/verb/JoinResponseTeam() if(!send_emergency_team) usr << "No emergency response team is currently being sent." return + if(jobban_isbanned(usr, "Syndicate") || jobban_isbanned(usr, "Emergency Response Team") || jobban_isbanned(usr, "Security Officer")) + usr << "You are jobbanned from the emergency reponse team!" + return if(response_team_members.len > 5) usr << "The emergency response team is already full!" @@ -32,10 +35,42 @@ client/verb/JoinResponseTeam() else usr << "You need to be an observer or new player to use this." +// returns a number of dead players in % +proc/percentage_dead() + var/total = 0 + var/deadcount = 0 + for(var/mob/living/carbon/human/H in world) if(H.mind) // I *think* monkeys gone human don't have a mind + if(H.stat == 2) deadcount++ + total++ + + if(total == 0) return 0 + else return round(100 * deadcount / total) + +// counts the number of antagonists in % +proc/percentage_antagonists() + var/total = 0 + var/antagonists = 0 + for(var/mob/living/carbon/human/H in world) + if(is_special_character(H) >= 1) + antagonists++ + total++ + + if(total == 0) return 0 + else return round(100 * antagonists / total) + + proc/trigger_armed_response_team() if(send_emergency_team) return + var/send_team_chance = 20 // base chance that a team will be sent + send_team_chance += 2*percentage_dead() // the more people are dead, the higher the chance + send_team_chance += percentage_antagonists() // the more antagonists, the higher the chance + send_team_chance = min(send_team_chance, 100) + + // there's only a certain chance a team will be sent + if(!prob(send_team_chance)) return + command_alert("According to our sensors, [station_name()] has entered code red. We will prepare and dispatch an emergency response team to deal with the situation.", "Command Report") send_emergency_team = 1 diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index 48c462e243c..2f94d139895 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -202,6 +202,12 @@ else jobs += "
[dd_replacetext("Syndicate", " ", " ")] " + if(jobban_isbanned(M, "Emergency Response Team")) + jobs += "
[dd_replacetext("Emergency Response Team", " ", " ")] " + else + jobs += "
[dd_replacetext("Emergency Response Team", " ", " ")] " + + if(jobban_isbanned(M, "pAI")) jobs += "
pAI " else @@ -333,6 +339,7 @@ jobs += "Scientist+RD
" jobs += "AI+Cyborg
" jobs += "Detective+HoS

" + jobs += "Emergency Response Team

" for(var/datum/job/job in job_master.occupations) if(job.title == "Tourist") continue From 301682f7fa75e75c865c001577bd0afc2bb74b97 Mon Sep 17 00:00:00 2001 From: cib Date: Thu, 19 Jan 2012 20:47:52 -0800 Subject: [PATCH 2/4] Added a Active Players verb. This verb shows you how many players are currently in the game and have been active in the last 10 minutes. --- code/game/verbs/who.dm | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/code/game/verbs/who.dm b/code/game/verbs/who.dm index 8ce32872d50..0660b1bfbea 100644 --- a/code/game/verbs/who.dm +++ b/code/game/verbs/who.dm @@ -34,3 +34,16 @@ usr << "[M.key] is a [M.client.holder.rank][M.client.stealth ? " (as [M.client.fakekey])" : ""]" else if(!M.client.stealth && (M.client.holder.level != -3)) usr << "\t[M.client]" + +/client/verb/active_players() + set category = "OOC" + set name = "Active Players" + var/total = 0 + for(var/mob/living/M in world) + if(!M.client) continue + if(M.client.inactivity > 10 * 60 * 10) continue + if(M.stat == 2) continue + + total++ + + usr << "Active Players: [total]" \ No newline at end of file From 39a4def8021c16a38c3262feade6a0c574c17fb9 Mon Sep 17 00:00:00 2001 From: Albert Iordache Date: Sat, 21 Jan 2012 09:59:28 +0200 Subject: [PATCH 3/4] Minor spelling changes. --- code/game/machinery/OpTable.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/game/machinery/OpTable.dm b/code/game/machinery/OpTable.dm index d95784d41dd..306431524df 100644 --- a/code/game/machinery/OpTable.dm +++ b/code/game/machinery/OpTable.dm @@ -1,6 +1,6 @@ /obj/machinery/optable - name = "Operating Table" - desc = "Used for advanced medical procedures. Apparently this includes the clown." + name = "Operating table" + desc = "Used for advanced medical procedures." icon = 'surgery.dmi' icon_state = "table2-idle" density = 1 @@ -133,7 +133,7 @@ return /obj/machinery/optable/portable - name = "mobile operating Table" + name = "Mobile operating table" desc = "Used for advanced medical procedures. Seems to be movable, neat." icon = 'rollerbed.dmi' icon_state = "up" From 8acc4d5facbbe70b15e00db949bca2dadde54edf Mon Sep 17 00:00:00 2001 From: cib Date: Fri, 20 Jan 2012 16:50:07 -0800 Subject: [PATCH 4/4] Changed the miniblob replication speed from every 3 seconds to every 15 seconds. --- code/game/events/EventProcs/miniblob.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/events/EventProcs/miniblob.dm b/code/game/events/EventProcs/miniblob.dm index b9cd328c257..eaeb7f44662 100644 --- a/code/game/events/EventProcs/miniblob.dm +++ b/code/game/events/EventProcs/miniblob.dm @@ -13,7 +13,7 @@ blobevent = 1 spawn(0) dotheblobbaby() - spawn(3000) + spawn(15000) blobevent = 0 spawn(rand(3000, 6000)) //Delayed announcements to keep the crew on their toes. command_alert("Confirmed outbreak of level 5 biohazard aboard [station_name()]. All personnel must contain the outbreak.", "Biohazard Alert") @@ -29,5 +29,5 @@ if(B.z != 1) continue B.Life() - spawn(30) + spawn(150) dotheblobbaby() \ No newline at end of file