From ff4f9a76990e7b7e67cbcaf94bcc79cb472c1603 Mon Sep 17 00:00:00 2001 From: "giacomand@gmail.com" Date: Sun, 23 Sep 2012 16:29:51 +0000 Subject: [PATCH] -Fix for runtime errors when shuttles move. Apparently the list holds unsimulated turf, which came from the shuttle, even though the list type is for simulated turf only. Because of this it was generating runtime errors. I made the foreach loop do a type check to fix this issue for now. -Instead of an admin message, edited minds will instead just log. Requested by Kor. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4741 316c924e-a436-60f5-8080-3fe189b3f50e --- code/FEA/FEA_system.dm | 3 +-- code/datums/mind.dm | 34 +++++++++++++++++----------------- 2 files changed, 18 insertions(+), 19 deletions(-) diff --git a/code/FEA/FEA_system.dm b/code/FEA/FEA_system.dm index 963b9662179..7d7d9754602 100644 --- a/code/FEA/FEA_system.dm +++ b/code/FEA/FEA_system.dm @@ -277,8 +277,7 @@ datum return 1 process_update_tiles() - for(var/turf in tiles_to_update) - var/turf/simulated/T = turf + for(var/turf/simulated/T in tiles_to_update) T.update_air_properties() /* for(var/obj/movable/floor/O in tiles_to_update) diff --git a/code/datums/mind.dm b/code/datums/mind.dm index f004e281cd4..f35cd17df60 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -485,7 +485,7 @@ datum/mind current << "\red You have been brainwashed! You are no longer a head revolutionary!" ticker.mode.update_rev_icons_removed(src) special_role = null - message_admins("[key_name_admin(usr)] has de-rev'ed [current].", 1) + log_admin("[key_name_admin(usr)] has de-rev'ed [current].") if("rev") if(src in ticker.mode.head_revolutionaries) @@ -499,7 +499,7 @@ datum/mind ticker.mode.revolutionaries += src ticker.mode.update_rev_icons_added(src) special_role = "Revolutionary" - message_admins("[key_name(usr)] has rev'ed [current].") + log_admin("[key_name(usr)] has rev'ed [current].") if("headrev") if(src in ticker.mode.revolutionaries) @@ -524,7 +524,7 @@ datum/mind ticker.mode.head_revolutionaries += src ticker.mode.update_rev_icons_added(src) special_role = "Head Revolutionary" - message_admins("[key_name_admin(usr)] has head-rev'ed [current].", 1) + log_admin("[key_name_admin(usr)] has head-rev'ed [current].") if("autoobjectives") ticker.mode.forge_revolutionary_objectives(src) @@ -573,7 +573,7 @@ datum/mind cult.memoize_cult_objectives(src) current << "\red You have been brainwashed! You are no longer a cultist!" memory = "" - message_admins("[key_name_admin(usr)] has de-cult'ed [current].", 1) + log_admin("[key_name_admin(usr)] has de-cult'ed [current].") if("cultist") if(!(src in ticker.mode.cult)) ticker.mode.cult += src @@ -584,7 +584,7 @@ datum/mind var/datum/game_mode/cult/cult = ticker.mode if (istype(cult)) cult.memoize_cult_objectives(src) - message_admins("[key_name_admin(usr)] has cult'ed [current].", 1) + log_admin("[key_name_admin(usr)] has cult'ed [current].") if("tome") var/mob/living/carbon/human/H = current if (istype(H)) @@ -615,14 +615,14 @@ datum/mind special_role = null current.spellremove(current, config.feature_object_spell_system? "object":"verb") current << "\red You have been brainwashed! You are no longer a wizard!" - message_admins("[key_name_admin(usr)] has de-wizard'ed [current].", 1) + log_admin("[key_name_admin(usr)] has de-wizard'ed [current].") if("wizard") if(!(src in ticker.mode.wizards)) ticker.mode.wizards += src special_role = "Wizard" //ticker.mode.learn_basic_spells(current) current << "\red You are the Space Wizard!" - message_admins("[key_name_admin(usr)] has wizard'ed [current].", 1) + log_admin("[key_name_admin(usr)] has wizard'ed [current].") if("lair") current.loc = pick(wizardstart) if("dressup") @@ -642,14 +642,14 @@ datum/mind current.remove_changeling_powers() if(changeling) del(changeling) current << "You grow weak and lose your powers! You are no longer a changeling and are stuck in your current form!" - message_admins("[key_name_admin(usr)] has de-changeling'ed [current].", 1) + log_admin("[key_name_admin(usr)] has de-changeling'ed [current].") if("changeling") if(!(src in ticker.mode.changelings)) ticker.mode.changelings += src ticker.mode.grant_changeling_powers(current) special_role = "Changeling" current << "Your powers are awoken. A flash of memory returns to us...we are a changeling!" - message_admins("[key_name_admin(usr)] has changeling'ed [current].", 1) + log_admin("[key_name_admin(usr)] has changeling'ed [current].") if("autoobjectives") ticker.mode.forge_changeling_objectives(src) usr << "\blue The objectives for changeling [key] have been generated. You can edit them and anounce manually." @@ -673,7 +673,7 @@ datum/mind for (var/datum/objective/nuclear/O in objectives) objectives-=O current << "\red You have been brainwashed! You are no longer a syndicate operative!" - message_admins("[key_name_admin(usr)] has de-nuke op'ed [current].", 1) + log_admin("[key_name_admin(usr)] has de-nuke op'ed [current].") if("nuclear") if(!(src in ticker.mode.syndicates)) ticker.mode.syndicates += src @@ -686,7 +686,7 @@ datum/mind current << "\blue You are a [syndicate_name()] agent!" ticker.mode.forge_syndicate_objectives(src) ticker.mode.greet_syndicate(src) - message_admins("[key_name_admin(usr)] has nuke op'ed [current].", 1) + log_admin("[key_name_admin(usr)] has nuke op'ed [current].") if("lair") current.loc = get_turf(locate("landmark*Syndicate-Spawn")) if("dressup") @@ -722,14 +722,14 @@ datum/mind ticker.mode.traitors -= src special_role = null current << "\red You have been brainwashed! You are no longer a traitor!" - message_admins("[key_name_admin(usr)] has de-traitor'ed [current].", 1) + log_admin("[key_name_admin(usr)] has de-traitor'ed [current].") if("traitor") if(!(src in ticker.mode.traitors)) ticker.mode.traitors += src special_role = "traitor" current << "\red You are a traitor!" - message_admins("[key_name_admin(usr)] has traitor'ed [current].", 1) + log_admin("[key_name_admin(usr)] has traitor'ed [current].") if("autoobjectives") ticker.mode.forge_traitor_objectives(src) @@ -809,11 +809,11 @@ datum/mind current.icon_state = "ai" current << "\red You have been patched! You are no longer malfunctioning!" - message_admins("[key_name_admin(usr)] has de-malf'ed [current].", 1) + log_admin("[key_name_admin(usr)] has de-malf'ed [current].") if("malf") make_AI_Malf() - message_admins("[key_name_admin(usr)] has malf'ed [current].", 1) + log_admin("[key_name_admin(usr)] has malf'ed [current].") if("unemag") var/mob/living/silicon/robot/R = current @@ -830,7 +830,7 @@ datum/mind else if(R.module_state_3 == R.module.emag) R.module_state_3 = null R.contents -= R.module.emag - message_admins("[key_name_admin(usr)] has unemag'ed [R].", 1) + log_admin("[key_name_admin(usr)] has unemag'ed [R].") if("unemagcyborgs") if (istype(current, /mob/living/silicon/ai)) @@ -849,7 +849,7 @@ datum/mind else if(R.module_state_3 == R.module.emag) R.module_state_3 = null R.contents -= R.module.emag - message_admins("[key_name_admin(usr)] has unemag'ed [ai]'s Cyborgs.", 1) + log_admin("[key_name_admin(usr)] has unemag'ed [ai]'s Cyborgs.") else if (href_list["common"]) switch(href_list["common"])