cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-22 04:30:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7613 from Kraseo/080215

Browse Source 
A few bug fixes
This commit is contained in:
phil235
2015-02-09 20:35:43 +01:00
parent e1412250da 80191947e2
commit 3afdaabbb2
4 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/admin/verbs/one_click_antag.dm
+7 -6
View File
@@ -465,20 +465,21 @@ client/proc/one_click_antag()
//Spawn and equip the officer
var/mob/living/carbon/human/ERTOperative = new(spawnloc)
var/list/lastname = last_names
chosen_candidate.client.prefs.copy_to(ERTOperative)
ready_dna(ERTOperative)
switch(numagents)
if(1)
ERTOperative.real_name = "Commander [pick(ERTOperative.real_name)]"
ERTOperative.real_name = "Commander [pick(lastname)]"
equip_emergencyresponsesquad(ERTOperative, "commander")
if(2 || 5)
ERTOperative.real_name = "Officer [pick(ERTOperative.real_name)]"
ERTOperative.real_name = "Security Officer [pick(lastname)]"
equip_emergencyresponsesquad(ERTOperative, "sec")
if(3 || 6)
ERTOperative.real_name = "Officer [pick(ERTOperative.real_name)]"
ERTOperative.real_name = "Medical Officer [pick(lastname)]"
equip_emergencyresponsesquad(ERTOperative, "med")
if(4 || 7)
ERTOperative.real_name = "Officer [pick(ERTOperative.real_name)]"
ERTOperative.real_name = "Engineer [pick(lastname)]"
equip_emergencyresponsesquad(ERTOperative, "eng")
ERTOperative.key = chosen_candidate.key
ERTOperative.mind.assigned_role = "ERT"
@@ -493,7 +494,7 @@ client/proc/one_click_antag()
ERTOperative.mind.objectives += missionobj
//Greet the commando
ERTOperative << "<B><font size=3 color=red>You are the [numagents==1?"Emergency Response Team Commander":"Emergency Response Officer"].</font></B>"
ERTOperative << "<B><font size=3 color=red>You are [numagents==1?"the Emergency Response Team Commander":"an Emergency Response Officer"].</font></B>"
var/missiondesc = "Your squad is being sent on a mission to [station_name()] by Nanotrasen's Security Division."
if(numagents == 1) //If Squad Leader
missiondesc += " Lead your squad to ensure the completion of the mission. Avoid civilian casualites when possible. Board the shuttle when your team is ready."
@@ -505,7 +506,7 @@ client/proc/one_click_antag()
//Logging and cleanup
if(numagents == 1)
message_admins("The emergency response team has spawned with the mission: [mission].")
log_game("[key_name(ERTOperative)] has been selected as a Emergency Response Officer")
log_game("[key_name(ERTOperative)] has been selected as an Emergency Response Officer")
spawnpoints -= spawnloc
numagents--
code/modules/paperwork/filingcabinet.dm
+5
View File
@@ -35,6 +35,11 @@
if(istype(I, /obj/item/weapon/paper) || istype(I, /obj/item/weapon/folder) || istype(I, /obj/item/weapon/photo))
I.loc = src
/obj/structure/filingcabinet/ex_act(severity, target)
for(var/obj/item/I in src)
I.loc = src.loc
qdel(src)
..()
/obj/structure/filingcabinet/attackby(obj/item/P, mob/user)
if(istype(P, /obj/item/weapon/paper) || istype(P, /obj/item/weapon/folder) || istype(P, /obj/item/weapon/photo) || istype(P, /obj/item/documents))