From 43a349ee2ac97cb0153d918e2cd48556ae49f96b Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Mon, 7 Sep 2015 14:25:45 +0930 Subject: [PATCH 01/10] Fixes #11022 --- code/controllers/emergency_shuttle_controller.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/controllers/emergency_shuttle_controller.dm b/code/controllers/emergency_shuttle_controller.dm index 7e0d1e2d25..aa13f07510 100644 --- a/code/controllers/emergency_shuttle_controller.dm +++ b/code/controllers/emergency_shuttle_controller.dm @@ -24,7 +24,7 @@ var/global/datum/emergency_shuttle_controller/emergency_shuttle /datum/emergency_shuttle_controller/proc/process() if (wait_for_launch) - if (auto_recall && world.time >= auto_recall_time) + if (evac && auto_recall && world.time >= auto_recall_time) recall() if (world.time >= launch_time) //time to launch the shuttle stop_launch_countdown() From 88b95e1207d7fa034ed8dace76fe0e34c558a794 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Mon, 7 Sep 2015 14:40:23 +0930 Subject: [PATCH 02/10] Fixes #7951 --- .../objects/items/weapons/implants/implanter.dm | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/code/game/objects/items/weapons/implants/implanter.dm b/code/game/objects/items/weapons/implants/implanter.dm index 4f2c491d6b..31fc7b31cc 100644 --- a/code/game/objects/items/weapons/implants/implanter.dm +++ b/code/game/objects/items/weapons/implants/implanter.dm @@ -8,17 +8,24 @@ w_class = 2.0 var/obj/item/weapon/implant/imp = null +/obj/item/weapon/implanter/attack_self(var/mob/user) + if(!imp) + return ..() + imp.loc = get_turf(src) + user.put_in_hands(imp) + user << "You remove \the [imp] from \the [src]." + name = "implanter" + imp = null + update() + return + /obj/item/weapon/implanter/proc/update() - - -/obj/item/weapon/implanter/update() if (src.imp) src.icon_state = "implanter1" else src.icon_state = "implanter0" return - /obj/item/weapon/implanter/attack(mob/M as mob, mob/user as mob) if (!istype(M, /mob/living/carbon)) return @@ -52,8 +59,6 @@ return - - /obj/item/weapon/implanter/loyalty name = "implanter-loyalty" From c2908bfc503b94b9f8a69151763b1d1b66945258 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Mon, 7 Sep 2015 14:43:12 +0930 Subject: [PATCH 03/10] Fixes #10951 --- code/modules/nano/modules/human_appearance.dm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/code/modules/nano/modules/human_appearance.dm b/code/modules/nano/modules/human_appearance.dm index 069a219546..9c533c0438 100644 --- a/code/modules/nano/modules/human_appearance.dm +++ b/code/modules/nano/modules/human_appearance.dm @@ -93,6 +93,10 @@ return 0 /obj/nano_module/appearance_changer/ui_interact(mob/user, ui_key = "main", var/datum/nanoui/ui = null, var/force_open = 1, var/datum/topic_state/state = default_state) + + if(!owner || !owner.species) + return + generate_data(check_whitelist, whitelist, blacklist) var/data[0] From 211e4260099a269d65a00fcfe198bf84fa642570 Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Mon, 7 Sep 2015 14:43:20 +0930 Subject: [PATCH 04/10] Tweak. --- code/modules/admin/verbs/randomverbs.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/admin/verbs/randomverbs.dm b/code/modules/admin/verbs/randomverbs.dm index 5534997731..a66c619b08 100644 --- a/code/modules/admin/verbs/randomverbs.dm +++ b/code/modules/admin/verbs/randomverbs.dm @@ -778,7 +778,7 @@ Traitors and the like can also be revived with the previous role mostly intact. if(confirm != "Yes") return var/choice - if(ticker.mode.name == "revolution" || ticker.mode.name == "confliction") + if(ticker.mode.auto_recall_shuttle) choice = input("The shuttle will just return if you call it. Call anyway?") in list("Confirm", "Cancel") if(choice == "Confirm") emergency_shuttle.auto_recall = 1 //enable auto-recall From 8e9705b6c70b4227df6abda94554bf83411339ab Mon Sep 17 00:00:00 2001 From: PsiOmega Date: Mon, 7 Sep 2015 08:16:31 +0200 Subject: [PATCH 05/10] Re-adds recharge station checks. Because no one who stuffs non-operational/dead borgs into recharge stations will bother to eject them. --- code/game/machinery/rechargestation.dm | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/code/game/machinery/rechargestation.dm b/code/game/machinery/rechargestation.dm index 6f3041dd6d..1ed307ee11 100644 --- a/code/game/machinery/rechargestation.dm +++ b/code/game/machinery/rechargestation.dm @@ -197,8 +197,7 @@ build_overlays() /obj/machinery/recharge_station/Bumped(var/mob/living/silicon/robot/R) - if(istype(R)) - go_in(R) + go_in(R) /obj/machinery/recharge_station/proc/go_in(var/mob/living/silicon/robot/R) if(!istype(R)) @@ -206,10 +205,18 @@ if(occupant) return + // TODO : Change to incapacitated() on merge. + if(R.stat || R.lying || R.resting || R.buckled) + return + if(!R.cell) + return + + add_fingerprint(R) R.reset_view(src) R.forceMove(src) occupant = R update_icon() + return 1 /obj/machinery/recharge_station/proc/go_out() if(!occupant) @@ -238,9 +245,4 @@ set name = "Enter Recharger" set src in oview(1) - // TODO : Change to incapacitated() on merge. - if(usr.stat || usr.lying || usr.resting || usr.buckled) - return - go_in(usr) - add_fingerprint(usr) From 412ee32d1c218dcbe9babd8165a2510ebd4a97bf Mon Sep 17 00:00:00 2001 From: Zuhayr Date: Mon, 7 Sep 2015 17:01:34 +0930 Subject: [PATCH 06/10] Stops autotraitor grabbing minds from the lobby for antag roles. --- code/game/gamemodes/game_mode.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/game/gamemodes/game_mode.dm b/code/game/gamemodes/game_mode.dm index 4325cde9ce..705c044e01 100644 --- a/code/game/gamemodes/game_mode.dm +++ b/code/game/gamemodes/game_mode.dm @@ -515,6 +515,8 @@ var/global/list/additional_antag_types = list() for(var/mob/player in player_list) if(!player.client) continue + if(istype(player, /mob/new_player)) + continue if(!role || (player.client.prefs.be_special & role)) log_debug("[player.key] had [antag_id] enabled, so we are drafting them.") candidates |= player.mind From 0e2f44e3ac06b975a7840416d25c9460537dfe9a Mon Sep 17 00:00:00 2001 From: PsiOmega Date: Mon, 7 Sep 2015 20:02:43 +0200 Subject: [PATCH 07/10] Admin logs bought uplink items. --- code/game/objects/items/devices/uplinks.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/game/objects/items/devices/uplinks.dm b/code/game/objects/items/devices/uplinks.dm index 45db522463..c8f23054e4 100644 --- a/code/game/objects/items/devices/uplinks.dm +++ b/code/game/objects/items/devices/uplinks.dm @@ -147,6 +147,7 @@ datum/nano_item_lists uses -= UI.cost used_TC += UI.cost feedback_add_details("traitor_uplink_items_bought", reference) + log_and_message_admins("used \the [src.loc] uplink to buy \a [UI].") var/list/L = UI.generate_item(get_turf(usr)) if(ishuman(usr)) From ec7e2491be144ab056e292aabc0ba00c399aa269 Mon Sep 17 00:00:00 2001 From: PsiOmegaDelta Date: Tue, 8 Sep 2015 08:03:14 +0200 Subject: [PATCH 08/10] Updates "on merge" entries. Relocates code. --- code/game/machinery/rechargestation.dm | 6 ++---- code/game/objects/items/devices/uplink_items.dm | 2 ++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/code/game/machinery/rechargestation.dm b/code/game/machinery/rechargestation.dm index 1ed307ee11..ac5ae8d8c7 100644 --- a/code/game/machinery/rechargestation.dm +++ b/code/game/machinery/rechargestation.dm @@ -205,8 +205,7 @@ if(occupant) return - // TODO : Change to incapacitated() on merge. - if(R.stat || R.lying || R.resting || R.buckled) + if(R.incapacitated()) return if(!R.cell) return @@ -232,8 +231,7 @@ set name = "Eject Recharger" set src in oview(1) - // TODO : Change to incapacitated() on merge. - if(usr.stat || usr.lying || usr.resting || usr.buckled) + if(usr.incapacitated()) return go_out() diff --git a/code/game/objects/items/devices/uplink_items.dm b/code/game/objects/items/devices/uplink_items.dm index 4046b6a261..c5d317bc51 100644 --- a/code/game/objects/items/devices/uplink_items.dm +++ b/code/game/objects/items/devices/uplink_items.dm @@ -83,6 +83,7 @@ var/datum/uplink/uplink = new() /datum/uplink_item/proc/purchase_log(obj/item/device/uplink/U) feedback_add_details("traitor_uplink_items_bought", "[src]") + log_and_message_admins("used \the [U.loc] to buy \a [src]") U.purchase_log[src] = U.purchase_log[src] + 1 datum/uplink_item/dd_SortValue() @@ -481,6 +482,7 @@ datum/uplink_item/dd_SortValue() /datum/uplink_item/item/badassery/random_many/purchase_log(obj/item/device/uplink/U) feedback_add_details("traitor_uplink_items_bought", "[src]") + log_and_message_admins("used \the [U.loc] to buy \a [src]") /**************** * Surplus Crate * From 92e510b2e0daf76552d9c6051aa7d1eac2797ca9 Mon Sep 17 00:00:00 2001 From: PsiOmegaDelta Date: Tue, 8 Sep 2015 08:23:34 +0200 Subject: [PATCH 09/10] Updates changelog. --- html/changelog.html | 6 ++++++ html/changelogs/.all_changelog.yml | 3 +++ html/changelogs/HarpyEagle-gun-desc.yml | 3 --- html/changelogs/Soadreqm-PR-10398 | 6 ------ 4 files changed, 9 insertions(+), 9 deletions(-) delete mode 100644 html/changelogs/HarpyEagle-gun-desc.yml delete mode 100644 html/changelogs/Soadreqm-PR-10398 diff --git a/html/changelog.html b/html/changelog.html index f08e92c320..afa21cd997 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -56,6 +56,12 @@ -->
+

08 September 2015

+

Soadreqm updated:

+
    +
  • Increased changeling starting genetic points to 25.
    • +
+

07 September 2015

GinjaNinja32 updated:

    diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index a2622755ee..e720f6f04c 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -2296,3 +2296,6 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. - tweak: 'Changed the language prefix keys to the following: , # -' - rscadd: Language prefix keys can be changed in the Character Setup. Changes are currently not global, but per character. +2015-09-08: + Soadreqm: + - tweak: Increased changeling starting genetic points to 25. diff --git a/html/changelogs/HarpyEagle-gun-desc.yml b/html/changelogs/HarpyEagle-gun-desc.yml deleted file mode 100644 index a999f1236d..0000000000 --- a/html/changelogs/HarpyEagle-gun-desc.yml +++ /dev/null @@ -1,3 +0,0 @@ -author: HarpyEagle -changes: [] -delete-after: false diff --git a/html/changelogs/Soadreqm-PR-10398 b/html/changelogs/Soadreqm-PR-10398 deleted file mode 100644 index f760994abc..0000000000 --- a/html/changelogs/Soadreqm-PR-10398 +++ /dev/null @@ -1,6 +0,0 @@ -author: Soadreqm - -delete-after: True - -changes: - - tweak: "Increased changeling starting genetic points to 25." From 23a3433e6769f7c66efa91d20b4887926b67f778 Mon Sep 17 00:00:00 2001 From: PsiOmegaDelta Date: Tue, 8 Sep 2015 08:32:09 +0200 Subject: [PATCH 10/10] Moves nanomanager.close_uis(src) into datum/proc/Destroy() instead of /obj/Destroy() now that NanoUI supports datums. --- code/controllers/Processes/garbage.dm | 3 ++- code/game/objects/objs.dm | 1 - 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/controllers/Processes/garbage.dm b/code/controllers/Processes/garbage.dm index 0203875e43..8106320fbf 100644 --- a/code/controllers/Processes/garbage.dm +++ b/code/controllers/Processes/garbage.dm @@ -136,7 +136,7 @@ world/loop_checks = 0 return ..()+"([garbage_collector.destroyed.len]/[garbage_collector.dels]/[garbage_collector.hard_dels])" // Tests if an atom has been deleted. -/proc/deleted(atom/A) +/proc/deleted(atom/A) return !A || !isnull(A.gcDestroyed) // Should be treated as a replacement for the 'del' keyword. @@ -187,6 +187,7 @@ world/loop_checks = 0 // This should be overridden to remove all references pointing to the object being destroyed. // Return true if the the GC controller should allow the object to continue existing. (Useful if pooling objects.) /datum/proc/Destroy() + nanomanager.close_uis(src) tag = null return diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm index 7f7e556657..800659307e 100644 --- a/code/game/objects/objs.dm +++ b/code/game/objects/objs.dm @@ -17,7 +17,6 @@ /obj/Destroy() processing_objects -= src - nanomanager.close_uis(src) return ..() /obj/Topic(href, href_list, var/datum/topic_state/state = default_state)