From 201e064d959b71dff1f7f4a7964f952d6e7e4d63 Mon Sep 17 00:00:00 2001 From: Alberyk Date: Tue, 31 Jan 2017 17:40:46 -0200 Subject: [PATCH 1/3] Fixes #1669 & adds missing xenoarch sprite (#1688) --- code/game/mecha/mecha.dm | 8 ++++++-- icons/obj/xenoarchaeology.dmi | Bin 72040 -> 73934 bytes 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index 3f68e00a92b..12bbf7644d8 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -601,6 +601,7 @@ return /obj/mecha/attack_hand(mob/user as mob) + user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) src.log_message("Attack by hand/paw. Attacker - [user].",1) if(istype(user,/mob/living/carbon/human)) @@ -758,7 +759,7 @@ ////////////////////// /obj/mecha/attackby(obj/item/weapon/W as obj, mob/user as mob) - + if(istype(W, /obj/item/mecha_parts/mecha_equipment)) var/obj/item/mecha_parts/mecha_equipment/E = W spawn() @@ -870,6 +871,7 @@ return else + user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) src.log_message("Attacked by [W]. Attacker - [user]") if(deflect_hit(is_melee=1)) @@ -1928,7 +1930,9 @@ return icon_state /obj/mecha/attack_generic(var/mob/user, var/damage, var/attack_message) - + + user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) + if(!damage) return 0 diff --git a/icons/obj/xenoarchaeology.dmi b/icons/obj/xenoarchaeology.dmi index 55cacabba77d71ba655fbfb5d2132c6f630e251d..282ac1098a8464209843dd2815d0b43ee93fc6a9 100644 GIT binary patch delta 12556 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 VFi&zLc7%W*P1PqVwMteI{|^JX7a0Hm delta 10647 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 wC1@iN=>UHaLoRQNP+f=o_ue4*|2%L3HjU)2^2D Date: Fri, 3 Feb 2017 20:06:30 -0200 Subject: [PATCH 2/3] Fix not working fake central command announcement (#1692) - Fixes #1663 -maybe fix pAI not being selected -fix invisible tactical tracksuits --- code/datums/uplink/announcements.dm | 11 ++++++++++- code/datums/uplink/uplink_items.dm | 7 ++++++- code/game/mecha/mecha.dm | 2 +- code/game/objects/items/devices/uplink.dm | 5 +++++ code/modules/ghosttrap/trap.dm | 19 ++++++++++++++++++- html/changelogs/alberyk-PR-1692.yml | 6 ++++++ icons/obj/tracksuit.dmi | Bin 1182 -> 1175 bytes 7 files changed, 46 insertions(+), 4 deletions(-) create mode 100644 html/changelogs/alberyk-PR-1692.yml diff --git a/code/datums/uplink/announcements.dm b/code/datums/uplink/announcements.dm index baad42f5c1d..3f77b5fe360 100644 --- a/code/datums/uplink/announcements.dm +++ b/code/datums/uplink/announcements.dm @@ -15,8 +15,17 @@ item_cost = round(DEFAULT_TELECRYSTAL_AMOUNT / 2) desc = "Causes a falsified [command_name()] Update. Triggers immediately after supplying additional data." +/datum/uplink_item/abstract/announcements/fake_centcom/extra_args(var/mob/user) + var/title = sanitize(input("Enter your announcement title.", "Announcement Title") as null|text) + if(!title) + return + var/message = sanitize(input("Enter your announcement message.", "Announcement Title") as null|text) + if(!message) + return + return list("title" = title, "message" = message) + /datum/uplink_item/abstract/announcements/fake_centcom/get_goods(var/obj/item/device/uplink/U, var/loc, var/mob/user, var/list/args) - command_announcement.Announce(args.["message"], args.["title"]) + command_announcement.Announce(args["message"], args["title"]) return 1 /datum/uplink_item/abstract/announcements/fake_crew_arrival diff --git a/code/datums/uplink/uplink_items.dm b/code/datums/uplink/uplink_items.dm index 6a2dc40c241..8636cb58acb 100644 --- a/code/datums/uplink/uplink_items.dm +++ b/code/datums/uplink/uplink_items.dm @@ -47,6 +47,9 @@ var/datum/uplink/uplink = new() if(!can_buy(U)) return + if(U.CanUseTopic(user, inventory_state) != STATUS_INTERACTIVE) + return + var/cost = cost(U.uses) var/goods = get_goods(U, get_turf(user), user, extra_args) @@ -143,7 +146,9 @@ datum/uplink_item/dd_SortValue() * Abstract Uplink Entries * * * ********************************/ -var/image/default_abstract_uplink_icon +/datum/uplink_item/abstract + var/static/image/default_abstract_uplink_icon + /datum/uplink_item/abstract/log_icon() if(!default_abstract_uplink_icon) default_abstract_uplink_icon = image('icons/obj/pda.dmi', "pda-syn") diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index 12bbf7644d8..50dca1f5dac 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -871,9 +871,9 @@ return else - user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) src.log_message("Attacked by [W]. Attacker - [user]") + user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN) if(deflect_hit(is_melee=1)) user << "\The [W] bounces off [src.name]." src.log_append_to_last("Armor saved.") diff --git a/code/game/objects/items/devices/uplink.dm b/code/game/objects/items/devices/uplink.dm index 8f704b2af8d..d033407c7d3 100644 --- a/code/game/objects/items/devices/uplink.dm +++ b/code/game/objects/items/devices/uplink.dm @@ -104,6 +104,11 @@ A list of items and costs is stored under the datum of every game mode, alongsid // Interaction code. Gathers a list of items purchasable from the paren't uplink and displays it. It also adds a lock button. /obj/item/device/uplink/hidden/interact(mob/user) ui_interact(user) + +/obj/item/device/uplink/hidden/CanUseTopic() + if(!active) + return STATUS_CLOSE + return ..() // The purchasing code. /obj/item/device/uplink/hidden/Topic(href, href_list) diff --git a/code/modules/ghosttrap/trap.dm b/code/modules/ghosttrap/trap.dm index 3cef2037b73..3b60a140f19 100644 --- a/code/modules/ghosttrap/trap.dm +++ b/code/modules/ghosttrap/trap.dm @@ -190,10 +190,27 @@ datum/ghosttrap/drone/transfer_personality(var/mob/candidate, var/mob/living/sil /*********************************** * Syndicate Cyborg * ***********************************/ +/* /datum/ghosttrap/syndicateborg object = "syndicate cyborg" ban_checks = list("Antagonist","AI","Cyborg") pref_check = "BE_SYNTH" ghost_trap_message = "They are occupying a syndicate cyborg now." ghost_trap_role = "Syndicate Cyborg" - can_set_own_name = TRUE + can_set_own_name = TRUE +*/ + +/************** +* pAI * +**************/ +/datum/ghosttrap/pai + object = "pAI" + pref_check = BE_PAI + ghost_trap_message = "They are occupying a pAI now." + ghost_trap_role = "pAI" + +datum/ghosttrap/pai/assess_candidate(var/mob/observer/ghost/candidate, var/mob/target) + return 0 + +datum/ghosttrap/pai/transfer_personality(var/mob/candidate, var/mob/living/silicon/robot/drone/drone) + return 0 diff --git a/html/changelogs/alberyk-PR-1692.yml b/html/changelogs/alberyk-PR-1692.yml new file mode 100644 index 00000000000..4bc74f32650 --- /dev/null +++ b/html/changelogs/alberyk-PR-1692.yml @@ -0,0 +1,6 @@ +author: Alberyk + +delete-after: True + +changes: + - bugfix: "Fixed the fake central command announcement, in the traitor uplinks, not working." diff --git a/icons/obj/tracksuit.dmi b/icons/obj/tracksuit.dmi index 51969b6535196722ae590b3e4c390b57b37c5186..106cb60ceb5c686c0884aabdbccba0daeb0eb9b6 100644 GIT binary patch delta 52 zcmbQoIh}JtALHVQ{T<4V&6mB3iw;}@)8c6^E From 6480655da5be7e0d1ed73110c099aa59bd6735dd Mon Sep 17 00:00:00 2001 From: skull132 Date: Fri, 3 Feb 2017 19:31:35 -0500 Subject: [PATCH 3/3] Changelogs, 03FEB2017 --- html/changelog.html | 6 ++++++ html/changelogs/.all_changelog.yml | 4 ++++ html/changelogs/alberyk-PR-1692.yml | 6 ------ 3 files changed, 10 insertions(+), 6 deletions(-) delete mode 100644 html/changelogs/alberyk-PR-1692.yml diff --git a/html/changelog.html b/html/changelog.html index 6413115ddb4..ffb5358b9da 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -56,6 +56,12 @@ -->
+

03 February 2017

+

Alberyk updated:

+
    +
  • Fixed the fake central command announcement, in the traitor uplinks, not working.
  • +
+

30 January 2017

Lohikar updated:

    diff --git a/html/changelogs/.all_changelog.yml b/html/changelogs/.all_changelog.yml index 63e147e0a38..6b59cbbab78 100644 --- a/html/changelogs/.all_changelog.yml +++ b/html/changelogs/.all_changelog.yml @@ -3769,3 +3769,7 @@ DO NOT EDIT THIS FILE BY HAND! AUTOMATICALLY GENERATED BY ss13_genchangelog.py. Lohikar: - bugfix: Fixed a bug that lead to crates blocking gas flow when they shouldn't, interfering with replacement SM crystal installation. +2017-02-03: + Alberyk: + - bugfix: Fixed the fake central command announcement, in the traitor uplinks, not + working. diff --git a/html/changelogs/alberyk-PR-1692.yml b/html/changelogs/alberyk-PR-1692.yml deleted file mode 100644 index 4bc74f32650..00000000000 --- a/html/changelogs/alberyk-PR-1692.yml +++ /dev/null @@ -1,6 +0,0 @@ -author: Alberyk - -delete-after: True - -changes: - - bugfix: "Fixed the fake central command announcement, in the traitor uplinks, not working."