From 457835db38d50ef8b5ee001b134d22c73a0d3580 Mon Sep 17 00:00:00 2001 From: Ccomp5950 Date: Sun, 17 Nov 2013 18:16:42 -0600 Subject: [PATCH 1/5] Admin request: Jobbans for IA and ERT --- code/modules/admin/topic.dm | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm index f1c911488a..6f25d8b05a 100644 --- a/code/modules/admin/topic.dm +++ b/code/modules/admin/topic.dm @@ -510,6 +510,12 @@ if(counter >= 5) //So things dont get squiiiiished! jobs += "" counter = 0 + + if(jobban_isbanned(M, "Internal Affairs Agent")) + jobs += "Internal Affairs Agent" + else + jobs += "Internal Affairs Agent" + jobs += "" //Non-Human (Green) @@ -583,6 +589,13 @@ else jobs += "[replacetext("Wizard", " ", " ")]" + //ERT + if(jobban_isbanned(M, "Emergency Response Team") || isbanned_dept) + jobs += "Emergency Response Team" + else + jobs += "Emergency Response Team" + + /* //Malfunctioning AI //Removed Malf-bans because they're a pain to impliment if(jobban_isbanned(M, "malf AI") || isbanned_dept) jobs += "[replacetext("Malf AI", " ", " ")]" @@ -2594,4 +2607,4 @@ show_player_info(ckey) if("list") PlayerNotesPage(text2num(href_list["index"])) - return \ No newline at end of file + return From 2a95cdd2966830b2a9a7617c6c970ebd58db55ca Mon Sep 17 00:00:00 2001 From: ZekeSulastin Date: Wed, 20 Nov 2013 17:07:05 -0500 Subject: [PATCH 2/5] Scalpels also mangle gloves for nonhuman wear. --- code/modules/clothing/gloves/stungloves.dm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/code/modules/clothing/gloves/stungloves.dm b/code/modules/clothing/gloves/stungloves.dm index fde681a4ea..7b52f3e4c9 100644 --- a/code/modules/clothing/gloves/stungloves.dm +++ b/code/modules/clothing/gloves/stungloves.dm @@ -32,7 +32,7 @@ else user << "[src] already have a cell." - else if(istype(W, /obj/item/weapon/wirecutters)) + else if(istype(W, /obj/item/weapon/wirecutters) || istype(W, /obj/item/weapon/scalpel)) wired = null @@ -43,7 +43,7 @@ cell = null if(clipped == 0) playsound(src.loc, 'sound/items/Wirecutter.ogg', 100, 1) - user.visible_message("\red [user] snips the fingertips off [src].","\red You snip the fingertips off [src].") + user.visible_message("\red [user] cut the fingertips off [src].","\red You cut the fingertips off [src].") clipped = 1 if("exclude" in species_restricted) name = "mangled [name]" @@ -78,4 +78,4 @@ if(wired) overlays += "gloves_wire" if(cell) - overlays += "gloves_cell" \ No newline at end of file + overlays += "gloves_cell" From 34fb26a64954ccb36eafba38c4cd809b367cb777 Mon Sep 17 00:00:00 2001 From: Ccomp5950 Date: Wed, 20 Nov 2013 17:11:21 -0600 Subject: [PATCH 3/5] Ravensdale request: Detomax cartridge use will not create an admin message saying the name/key of the antag that tried to blow up the target, and if it was successful or not. --- code/game/objects/items/devices/PDA/PDA.dm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm index 1cdd99d133..5367de7d95 100755 --- a/code/game/objects/items/devices/PDA/PDA.dm +++ b/code/game/objects/items/devices/PDA/PDA.dm @@ -715,8 +715,10 @@ var/global/list/obj/item/device/pda/PDAs = list() U.show_message("\red Energy feeds back into your [src]!", 1) U << browse(null, "window=pda") explode() + message_admins("Admin [U] ([U.Key]) just attempted to blow up [P] with the Detomax cartridge but failed, blowing himself up", 1) else U.show_message("\blue Success!", 1) + message_admins("Admin [U] ([U.Key]) just attempted to blow up [P] with the Detomax cartridge and succeded", 1) P.explode() else U << "PDA not found." @@ -1193,4 +1195,4 @@ var/global/list/obj/item/device/pda/PDAs = list() // Pass along the pulse to atoms in contents, largely added so pAIs are vulnerable to EMP /obj/item/device/pda/emp_act(severity) for(var/atom/A in src) - A.emp_act(severity) \ No newline at end of file + A.emp_act(severity) From d1ca50f384b1d33b1526790d121e548480bc146f Mon Sep 17 00:00:00 2001 From: Ccomp5950 Date: Wed, 20 Nov 2013 17:24:39 -0600 Subject: [PATCH 4/5] Bugfix: Yeah variables are case sensitive. Lesson learned: Always compile before commit, unless attempting to pad your commit count. --- code/game/objects/items/devices/PDA/PDA.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm index 5367de7d95..0fbac7f2b7 100755 --- a/code/game/objects/items/devices/PDA/PDA.dm +++ b/code/game/objects/items/devices/PDA/PDA.dm @@ -715,10 +715,10 @@ var/global/list/obj/item/device/pda/PDAs = list() U.show_message("\red Energy feeds back into your [src]!", 1) U << browse(null, "window=pda") explode() - message_admins("Admin [U] ([U.Key]) just attempted to blow up [P] with the Detomax cartridge but failed, blowing himself up", 1) + message_admins("Admin [U] ([U.key]) just attempted to blow up [P] with the Detomax cartridge but failed, blowing himself up", 1) else U.show_message("\blue Success!", 1) - message_admins("Admin [U] ([U.Key]) just attempted to blow up [P] with the Detomax cartridge and succeded", 1) + message_admins("Admin [U] ([U.key]) just attempted to blow up [P] with the Detomax cartridge and succeded", 1) P.explode() else U << "PDA not found." From 7d545437a3e33062719d3e5739b654a20d18095c Mon Sep 17 00:00:00 2001 From: Ccomp5950 Date: Wed, 20 Nov 2013 17:49:11 -0600 Subject: [PATCH 5/5] Spelling mistake. Commit_Count++ --- code/game/objects/items/devices/PDA/PDA.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm index 0fbac7f2b7..f8aebace5b 100755 --- a/code/game/objects/items/devices/PDA/PDA.dm +++ b/code/game/objects/items/devices/PDA/PDA.dm @@ -715,10 +715,10 @@ var/global/list/obj/item/device/pda/PDAs = list() U.show_message("\red Energy feeds back into your [src]!", 1) U << browse(null, "window=pda") explode() - message_admins("Admin [U] ([U.key]) just attempted to blow up [P] with the Detomax cartridge but failed, blowing himself up", 1) + message_admins("[U] ([U.key]) just attempted to blow up [P] with the Detomatix cartridge but failed, blowing themselves up", 1) else U.show_message("\blue Success!", 1) - message_admins("Admin [U] ([U.key]) just attempted to blow up [P] with the Detomax cartridge and succeded", 1) + message_admins("[U] ([U.key]) just attempted to blow up [P] with the Detomatix cartridge and succeded", 1) P.explode() else U << "PDA not found."