diff --git a/code/game/gamemodes/gang/recaller.dm b/code/game/gamemodes/gang/recaller.dm
index addef28d740..05c0ce477d3 100644
--- a/code/game/gamemodes/gang/recaller.dm
+++ b/code/game/gamemodes/gang/recaller.dm
@@ -49,7 +49,8 @@
dat += "Registration: [(gang == "A")? gang_name("A") : gang_name("B")] Gang [boss ? "Administrator" : "Lieutenant"]
"
dat += "Organization Size: [gang_size] | Station Control: [round((gang_territory/start_state.num_territories)*100, 1)]%
"
dat += "Send Gang-wide Message
"
- dat += "Recall Emergency Shuttle
"
+ if(gangmode)
+ dat += "Recall Emergency Shuttle
"
dat += "
"
dat += "Influence: [points]
"
dat += "Time until Influence grows: [(points >= 999) ? ("--:--") : (time2text(ticker.mode.gang_points.next_point_time - world.time, "mm:ss"))]
"
@@ -243,13 +244,13 @@
else if(gang == "B")
members += ticker.mode.B_bosses | ticker.mode.B_gang
if(members.len)
- var/ping = "[boss ? "Gang Boss" : "Gang Lieutenant"]: [message]"
+ var/ping = "[boss ? "Gang Boss" : "Gang Lieutenant"]: [message]"
for(var/datum/mind/ganger in members)
if(ganger.current.z <= 2)
- ganger.current << "[ping]"
+ ganger.current << "[ping]"
for(var/mob/M in dead_mob_list)
- M << "[gang_name(gang)] [ping]"
- log_game("[key_name(user)] sent a global message to the [gang_name(gang)] Gang ([gang]): [message].")
+ M << "[gang_name(gang)] [ping]"
+ log_game("[key_name(user)] Messaged [gang_name(gang)] Gang ([gang]): [message].")
/obj/item/device/gangtool/proc/register_device(var/mob/user)
@@ -294,6 +295,9 @@
if(recalling || !can_use(user))
return
+ if(!istype(ticker.mode, /datum/game_mode/gang))
+ return
+
recalling = 1
loc << "\icon[src]Generating shuttle recall order with codes retrieved from last call signal..."
diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm
index 341155a3721..0331e5cf8cb 100644
--- a/code/modules/paperwork/pen.dm
+++ b/code/modules/paperwork/pen.dm
@@ -112,7 +112,7 @@
return
cooldown = 1
icon_state = "pen_blink"
- spawn(600)
+ spawn(1200)
cooldown = 0
icon_state = "pen"
var/mob/M = get(src, /mob)