diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm
index 1cdd99d133..f8aebace5b 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("[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("[U] ([U.key]) just attempted to blow up [P] with the Detomatix 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)
diff --git a/code/modules/admin/topic.dm b/code/modules/admin/topic.dm
index f545283038..66de256c9e 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)
@@ -587,6 +593,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", " ", " ")] | "
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"