From 5705f6544413a14863a1cb46427339aebf2959fe Mon Sep 17 00:00:00 2001 From: Unknown Date: Tue, 10 Dec 2019 00:05:21 -0500 Subject: [PATCH 1/2] Post-patch Bug Fixes - Rana Starsong-Uma's fluff item is keyed to the right character - Fixes an error where a Vorestation hair style was overriding a Polaris one --- code/modules/mob/new_player/sprite_accessories_vr.dm | 2 +- config/custom_items.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/mob/new_player/sprite_accessories_vr.dm b/code/modules/mob/new_player/sprite_accessories_vr.dm index 741cda8dc4f..f9a736dc82f 100644 --- a/code/modules/mob/new_player/sprite_accessories_vr.dm +++ b/code/modules/mob/new_player/sprite_accessories_vr.dm @@ -378,7 +378,7 @@ gender = NEUTER vulp_hair_bun - name = "Bun" + name = "Vulp Bun" icon = 'icons/mob/human_face_vr.dmi' icon_add = 'icons/mob/human_face_vr_add.dmi' icon_state = "bun" diff --git a/config/custom_items.txt b/config/custom_items.txt index 16734abd704..44d79f3b4c8 100644 --- a/config/custom_items.txt +++ b/config/custom_items.txt @@ -482,7 +482,7 @@ item_path: /obj/item/clothing/accessory/storage/knifeharness { ckey: kitchifox -character_name: Rana Uma +character_name: Rana Starsong-Uma item_path: /obj/item/clothing/accessory/medal/silver/unity } From d7c4e8ebfe837a98d7ffc9426656f35725ff2f07 Mon Sep 17 00:00:00 2001 From: Unknown Date: Tue, 10 Dec 2019 00:09:48 -0500 Subject: [PATCH 2/2] SMES Fix --- maps/tether/tether-10-colony.dmm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/maps/tether/tether-10-colony.dmm b/maps/tether/tether-10-colony.dmm index 10cdf055d3e..e27ea01c407 100644 --- a/maps/tether/tether-10-colony.dmm +++ b/maps/tether/tether-10-colony.dmm @@ -17623,7 +17623,8 @@ cur_coils = 4; input_attempt = 1; input_level = 1e+006; - output_level = 1e+006 + output_level = 1e+006; + RCon = 0 }, /obj/structure/cable/cyan{ d2 = 2;