From f85e66640b1c9e00b4d89986586ecb3f03e916a1 Mon Sep 17 00:00:00 2001 From: LordFowl Date: Thu, 5 May 2016 20:32:40 -0400 Subject: [PATCH] Compatibility Patch Modifies grown.dm, station.dm, snacks.dm, and preferences.dm to be compatible with the latest devbuild. --- code/modules/client/preferences.dm | 2 +- code/modules/hydroponics/grown.dm | 4 ++-- .../mob/living/carbon/human/species/station/station.dm | 2 +- code/modules/reagents/reagent_containers/food/snacks.dm | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/code/modules/client/preferences.dm b/code/modules/client/preferences.dm index 58cf738b9ee..0ecc4e67f8e 100644 --- a/code/modules/client/preferences.dm +++ b/code/modules/client/preferences.dm @@ -1625,8 +1625,8 @@ datum/preferences SQLsave_character(current_slot, ckey) //save_preferences() //save_character() + if("reload") - for(var/ckey in preferences_datums) for(var/ckey in preferences_datums) var/datum/preferences/D = preferences_datums[ckey] if(D == src) diff --git a/code/modules/hydroponics/grown.dm b/code/modules/hydroponics/grown.dm index 40fd541f711..0c93b535f3f 100644 --- a/code/modules/hydroponics/grown.dm +++ b/code/modules/hydroponics/grown.dm @@ -249,7 +249,7 @@ M.lastattacker = user user.attack_log += "\[[time_stamp()]\] Attacked [M.name] ([M.ckey]) with [name] (INTENT: [uppertext(user.a_intent)]) (DAMTYE: [uppertext(damtype)])" M.attack_log += "\[[time_stamp()]\] Attacked by [user.name] ([user.ckey]) with [name] (INTENT: [uppertext(user.a_intent)]) (DAMTYE: [uppertext(damtype)])" - msg_admin_attack("[key_name(user)] attacked [key_name(M)] with [name] (INTENT: [uppertext(user.a_intent)]) (DAMTYE: [uppertext(damtype)])" ) + msg_admin_attack("[key_name(user)] attacked [key_name(M)] with [name] (INTENT: [uppertext(user.a_intent)]) (DAMTYE: [uppertext(damtype)]) (JMP)" ) if(istype(M, /mob/living/carbon/human)) var/mob/living/carbon/human/H = M @@ -403,4 +403,4 @@ var/list/fruit_icon_cache = list() var/image/I = image(icon,"fruit_slice") I.color = flesh_colour fruit_icon_cache["slice-[rind_colour]"] = I - overlays |= fruit_icon_cache["slice-[rind_colour]"] \ No newline at end of file + overlays |= fruit_icon_cache["slice-[rind_colour]"] diff --git a/code/modules/mob/living/carbon/human/species/station/station.dm b/code/modules/mob/living/carbon/human/species/station/station.dm index b71c3cae03d..486a541d08c 100644 --- a/code/modules/mob/living/carbon/human/species/station/station.dm +++ b/code/modules/mob/living/carbon/human/species/station/station.dm @@ -251,7 +251,7 @@ synth_temp_gain = 10 //this should cause IPCs to stabilize at ~80 C in a 20 C environment. - flags = CAN_JOIN | IS_WHITELISTED | NO_BREATHE | NO_SCAN | NO_BLOOD | NO_PAIN | IS_SYNTHETIC + flags = CAN_JOIN | IS_WHITELISTED | NO_BREATHE | NO_SCAN | NO_BLOOD | NO_PAIN | IS_SYNTHETIC | NO_POISON blood_color = "#1F181F" flesh_color = "#575757" diff --git a/code/modules/reagents/reagent_containers/food/snacks.dm b/code/modules/reagents/reagent_containers/food/snacks.dm index 3a7539c8dcb..ee0779057c0 100644 --- a/code/modules/reagents/reagent_containers/food/snacks.dm +++ b/code/modules/reagents/reagent_containers/food/snacks.dm @@ -89,7 +89,7 @@ M.attack_log += text("\[[time_stamp()]\] Has been fed [src.name] by [user.name] ([user.ckey]) Reagents: [reagentlist(src)]") user.attack_log += text("\[[time_stamp()]\] Fed [src.name] by [M.name] ([M.ckey]) Reagents: [reagentlist(src)]") - msg_admin_attack("[key_name(user)] fed [key_name(M)] with [src.name] Reagents: [reagentlist(src)] (INTENT: [uppertext(user.a_intent)])") + msg_admin_attack("[key_name(user)] fed [key_name(M)] with [src.name] Reagents: [reagentlist(src)] (INTENT: [uppertext(user.a_intent)]) (JMP)") user.visible_message("[user] feeds [M] [src].")