Merge branch 'master' into development

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

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")

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()
@@ -872,6 +873,7 @@
 	else
 		src.log_message("Attacked by [W]. Attacker - [user]")
 
+		user.setClickCooldown(DEFAULT_ATTACK_COOLDOWN)
 		if(deflect_hit(is_melee=1))
 			user << "<span class='danger'>\The [W] bounces off [src.name].</span>"
 			src.log_append_to_last("Armor saved.")
@@ -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
 

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)

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

html/changelog.html

@@ -56,6 +56,12 @@
 		
 		-->
 		<div class="commit sansserif">
+			<h2 class="date">03 February 2017</h2>
+			<h3 class="author">Alberyk updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Fixed the fake central command announcement, in the traitor uplinks, not working.</li>
+			</ul>
+
 			<h2 class="date">30 January 2017</h2>
 			<h3 class="author">Lohikar updated:</h3>
 			<ul class="changes bgimages16">

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.