From cc960624b97107355f876e63efbd34692fcf68f7 Mon Sep 17 00:00:00 2001 From: PsiOmega Date: Sun, 6 Sep 2015 10:07:39 +0200 Subject: [PATCH 1/3] Fixes mercenary mode not listing bought items. The mercenary leader now spawns with the uplink, as is set as its owner. --- code/game/antagonist/outsider/mercenary.dm | 15 +++++++-------- code/game/objects/items/devices/uplinks.dm | 2 +- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/code/game/antagonist/outsider/mercenary.dm b/code/game/antagonist/outsider/mercenary.dm index a8b03e605d..f703818e47 100644 --- a/code/game/antagonist/outsider/mercenary.dm +++ b/code/game/antagonist/outsider/mercenary.dm @@ -43,16 +43,15 @@ var/datum/antagonist/mercenary/mercs if(player.backbag == 4) player.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/satchel(player), slot_back) player.equip_to_slot_or_del(new /obj/item/weapon/storage/box/engineer(player.back), slot_in_backpack) player.equip_to_slot_or_del(new /obj/item/weapon/reagent_containers/pill/cyanide(player), slot_in_backpack) + + if (player.mind == leader) + var/obj/item/device/radio/uplink/U = new(player.loc) + U.hidden_uplink.uplink_owner = player.mind + U.hidden_uplink.uses = 40 + player.put_in_hands(U) + player.update_icons() create_id("Mercenary", player) create_radio(SYND_FREQ, player) return 1 - -/datum/antagonist/mercenary/create_nuke() - ..() - // Create the radio. - var/obj/effect/landmark/uplinkdevice = locate("landmark*Syndicate-Uplink") - if(uplinkdevice) - var/obj/item/device/radio/uplink/U = new(uplinkdevice.loc) - U.hidden_uplink.uses = 40 \ No newline at end of file diff --git a/code/game/objects/items/devices/uplinks.dm b/code/game/objects/items/devices/uplinks.dm index 96874bd946..45db522463 100644 --- a/code/game/objects/items/devices/uplinks.dm +++ b/code/game/objects/items/devices/uplinks.dm @@ -50,7 +50,7 @@ datum/nano_item_lists var/list/nanoui_data = new // Additional data for NanoUI use var/list/purchase_log = new - var/uplink_owner = null//text-only + var/datum/mind/uplink_owner = null var/used_TC = 0 /obj/item/device/uplink/nano_host() From 5a335c9140b057bcbd893c97bece8d8e960a8b20 Mon Sep 17 00:00:00 2001 From: GinjaNinja32 Date: Sun, 6 Sep 2015 20:41:06 +0100 Subject: [PATCH 2/3] Improve formatting of admin announcements --- code/modules/admin/admin.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/modules/admin/admin.dm b/code/modules/admin/admin.dm index c8a23881c3..b2d43b08e4 100644 --- a/code/modules/admin/admin.dm +++ b/code/modules/admin/admin.dm @@ -750,7 +750,8 @@ proc/admin_notice(var/message, var/rights) if(message) if(!check_rights(R_SERVER,0)) message = sanitize(message, 500, extra = 0) - world << "\blue [usr.client.holder.fakekey ? "Administrator" : usr.key] Announces:\n \t [message]" + message = replacetext(message, "\n", "
") // required since we're putting it in a

tag + world << "[usr.client.holder.fakekey ? "Administrator" : usr.key] Announces:

[message]

" log_admin("Announce: [key_name(usr)] : [message]") feedback_add_details("admin_verb","A") //If you are copy-pasting this, ensure the 2nd parameter is unique to the new proc! From 05a29f8f3a1e9f859f3be9c29347da11b052e7a2 Mon Sep 17 00:00:00 2001 From: Datraen Date: Sun, 6 Sep 2015 16:42:58 -0400 Subject: [PATCH 3/3] [BOTANY] Fixes plant storage nutrient check Reported only high, low or none with previous system. --- code/modules/hydroponics/seed_storage.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/hydroponics/seed_storage.dm b/code/modules/hydroponics/seed_storage.dm index a4f91ce94c..448173104b 100644 --- a/code/modules/hydroponics/seed_storage.dm +++ b/code/modules/hydroponics/seed_storage.dm @@ -101,7 +101,7 @@ if(seed.get_trait(TRAIT_REQUIRES_NUTRIENTS)) if(seed.get_trait(TRAIT_NUTRIENT_CONSUMPTION) < 0.05) dat += "Low" - else if(seed.get_trait(TRAIT_REQUIRES_NUTRIENTS) > 0.2) + else if(seed.get_trait(TRAIT_NUTRIENT_CONSUMPTION) > 0.2) dat += "High" else dat += "Norm"