Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics

code/datums/shuttles.dm

@@ -380,9 +380,14 @@
 /datum/map_template/shuttle/emergency/gorilla
 	suffix = "gorilla"
 	name = "Gorilla Cargo Freighter"
-	description = "A rustic, barely excuseable shuttle transporting important cargo. Not for crew who are about to go ape."
+	description = "(Emag only) A rustic, barely excuseable shuttle transporting important cargo. Not for crew who are about to go ape."
 	credit_cost = 2000
 
+/datum/map_template/shuttle/emergency/gorilla/prerequisites_met()
+	if("emagged" in SSshuttle.shuttle_purchase_requirements_met)
+		return TRUE
+	return FALSE
+
 /datum/map_template/shuttle/ferry/base
 	suffix = "base"
 	name = "transport ferry"

code/datums/status_effects/debuffs.dm

@@ -99,10 +99,12 @@
 	id = "Mesmerize"
 	alert_type = /obj/screen/alert/status_effect/mesmerized
 
-/datum/status_effect/no_combat_mode/mesmerize/on_apply()
+/datum/status_effect/no_combat_mode/mesmerize/on_creation(mob/living/new_owner, set_duration)
+	. = ..()
 	ADD_TRAIT(owner, TRAIT_MUTE, "mesmerize")
 
 /datum/status_effect/no_combat_mode/mesmerize/on_remove()
+	. = ..()
 	REMOVE_TRAIT(owner, TRAIT_MUTE, "mesmerize")
 
 /obj/screen/alert/status_effect/mesmerized

code/datums/world_topic.dm

@@ -139,9 +139,9 @@
 
 /datum/world_topic/status/Run(list/input, addr)
 	if(!key_valid) //If we have a key, then it's safe to trust that this isn't a malicious packet. Also prevents the extra info from leaking
-		if(GLOB.topic_status_lastcache <= world.time + 5)
+		if(GLOB.topic_status_lastcache >= world.time)
 			return GLOB.topic_status_cache
-		GLOB.topic_status_lastcache = world.time
+		GLOB.topic_status_lastcache = world.time + 5
 	. = list()
 	.["version"] = GLOB.game_version
 	.["mode"] = "hidden"	//CIT CHANGE - hides the gamemode in topic() calls to prevent meta'ing the gamemode