Merge branch 'master' into development

code/__defines/mobs.dm

@@ -210,5 +210,3 @@
 #define BRAIN_TRAUMA_MILD /datum/brain_trauma/mild
 #define BRAIN_TRAUMA_SEVERE /datum/brain_trauma/severe
 #define BRAIN_TRAUMA_SPECIAL /datum/brain_trauma/special
-
-#define BRAIN_DAMAGE_INTEGRITY_MULTIPLIER 0.5

code/datums/uplink/uplink_categories.dm

@@ -8,18 +8,16 @@
 	items = list()
 
 /datum/uplink_category/proc/can_view(obj/item/device/uplink/U)
+	if(!LAZYLEN(antag_roles))
+		for(var/datum/uplink_item/item in items)
+			if(item.can_view(U))
+				return 1
+		return 0
+	
 	for(var/antag_role in antag_roles)
 		var/datum/antagonist/antag = all_antag_types[antag_role]
 		if(antag.is_antagonist(U.uplink_owner))
 			return 1
-
-	for(var/datum/uplink_item/item in items)
-		if(item.can_view(U))
-			return 1
-
-	if(!LAZYLEN(antag_roles))
-		return 1
-
 	return 0
 
 /datum/uplink_category/ammunition

code/game/gamemodes/cult/ritual.dm

@@ -389,9 +389,7 @@ var/global/list/rnwords = list("ire","ego","nahlizet","certum","veri","jatkaa","
 				english += list(words[entry] = entry)
 
 		for (var/entry in dictionary)
-			var/list/required = dictionary[entry]
-			if (length(english&required) == required.len)
-				scribewords += entry
+			scribewords += entry
 
 		var/chosen_rune = null
 

code/game/gamemodes/vampire/vampire_powers.dm

@@ -747,7 +747,7 @@
 
 	admin_attack_log(src, T, "used diseased touch on [key_name(T)]", "was given a lethal disease by [key_name(src)]", "used diseased touch (<a href='?src=\ref[lethal];info=1'>virus info</a>) on")
 
-	vampire.use_blood(200)
+	vampire.use_blood(100)
 	verbs -= /mob/living/carbon/human/proc/vampire_diseasedtouch
 	ADD_VERB_IN_IF(src, 1800, /mob/living/carbon/human/proc/vampire_diseasedtouch, CALLBACK(src, .proc/finish_vamp_timeout))
 

code/game/jobs/access.dm

@@ -104,28 +104,28 @@
 	if(!priv_all_access)
 		priv_all_access = get_access_ids()
 
-	return priv_all_access
+	return priv_all_access.Copy()
 
 /var/list/priv_station_access
 /proc/get_all_station_access()
 	if(!priv_station_access)
 		priv_station_access = get_access_ids(ACCESS_TYPE_STATION)
 
-	return priv_station_access
+	return priv_station_access.Copy()
 
 /var/list/priv_centcom_access
 /proc/get_all_centcom_access()
 	if(!priv_centcom_access)
 		priv_centcom_access = get_access_ids(ACCESS_TYPE_CENTCOM)
 
-	return priv_centcom_access
+	return priv_centcom_access.Copy()
 
 /var/list/priv_syndicate_access
 /proc/get_all_syndicate_access()
 	if(!priv_syndicate_access)
 		priv_syndicate_access = get_access_ids(ACCESS_TYPE_SYNDICATE)
 
-	return priv_syndicate_access
+	return priv_syndicate_access.Copy()
 
 /var/list/priv_region_access
 /proc/get_region_accesses(var/code)

code/game/machinery/computer/prisoner.dm

@@ -32,7 +32,7 @@
 			var/turf/Tr = null
 			for(var/obj/item/weapon/implant/chem/C in implants)
 				Tr = get_turf(C)
-				if((Tr) && (Tr.z != src.z))	continue//Out of range
+				if(Tr && !isStationLevel(Tr.z))	continue//Out of range
 				if(!C.implanted) continue
 				dat += "[C.imp_in.name] | Remaining Units: [C.reagents.total_volume] | Inject: "
 				dat += "<A href='?src=\ref[src];inject1=\ref[C]'>(<font color=red>(1)</font>)</A>"
@@ -42,11 +42,11 @@
 			dat += "<HR>Tracking Implants<BR>"
 			for(var/obj/item/weapon/implant/tracking/T in implants)
 				Tr = get_turf(T)
-				if((Tr) && (Tr.z != src.z))	continue//Out of range
+				if(Tr && !isStationLevel(Tr.z))	continue//Out of range
 				if(!T.implanted) continue
 				var/loc_display = "Unknown"
 				var/mob/living/carbon/M = T.imp_in
-				if((M.z in current_map.station_levels) && !istype(M.loc, /turf/space))
+				if(isStationLevel(M.z) && !istype(M.loc, /turf/space))
 					var/turf/mob_loc = get_turf(M)
 					loc_display = mob_loc.loc
 				if(T.malfunction)

code/game/machinery/machinery.dm

@@ -371,6 +371,7 @@ Class Procs:
 						B.loc = src
 						user << "<span class='notice'>[A.name] replaced with [B.name].</span>"
 						break
+		RefreshParts()  
 		update_icon()
 	else
 		user << "<span class='notice'>Following parts detected in the machine:</span>"

code/game/mecha/mecha.dm

@@ -984,6 +984,10 @@
 		occupant  << "<span class='warning'>The [src] has no traction! There is nothing solid in reach to launch off.</span>"
 		return 0
 
+	if(state)
+		occupant_message("<span class='warning'>Maintenance protocols in effect.</span>")
+		return
+
 	lastcrash = world.time
 
 	occupant << "<span class='warning'>You take a step back, and then...</span>"

code/game/objects/items/devices/uplink.dm

@@ -318,16 +318,16 @@ A list of items and costs is stored under the datum of every game mode, alongsid
 // Includes normal radio uplink, multitool uplink,
 // implant uplink (not the implant tool) and a preset headset uplink.
 
-/obj/item/device/radio/uplink/New()
-	hidden_uplink = new(src)
+/obj/item/device/radio/uplink/New(var/loc, var/mind)
+	hidden_uplink = new(src, mind)
 	icon_state = "radio"
 
 /obj/item/device/radio/uplink/attack_self(mob/user as mob)
 	if(hidden_uplink)
 		hidden_uplink.trigger(user)
 
-/obj/item/device/multitool/uplink/New()
-	hidden_uplink = new(src)
+/obj/item/device/multitool/uplink/New(var/loc, var/mind)
+	hidden_uplink = new(src, mind)
 
 /obj/item/device/multitool/uplink/attack_self(mob/user as mob)
 	if(hidden_uplink)
@@ -336,9 +336,9 @@ A list of items and costs is stored under the datum of every game mode, alongsid
 /obj/item/device/radio/headset/uplink
 	traitor_frequency = 1445
 
-/obj/item/device/radio/headset/uplink/New()
+/obj/item/device/radio/headset/uplink/New(var/loc, var/mind)
 	..()
-	hidden_uplink = new(src)
+	hidden_uplink = new(src, mind)
 	hidden_uplink.uses = DEFAULT_TELECRYSTAL_AMOUNT
 
 /*
@@ -353,9 +353,9 @@ A list of items and costs is stored under the datum of every game mode, alongsid
 	flags = CONDUCT
 	w_class = 2
 
-/obj/item/device/contract_uplink/New()
+/obj/item/device/contract_uplink/New(var/loc, var/mind)
 	..()
-	hidden_uplink = new(src)
+	hidden_uplink = new(src, mind)
 	hidden_uplink.uses = 0
 	hidden_uplink.nanoui_menu = 3
 
@@ -397,9 +397,9 @@ A list of items and costs is stored under the datum of every game mode, alongsid
 	flags = CONDUCT
 	w_class = 2
 
-/obj/item/device/ninja_uplink/New()
+/obj/item/device/ninja_uplink/New(var/loc, var/mind)
 	..()
-	hidden_uplink = new(src)
+	hidden_uplink = new(src, mind)
 	hidden_uplink.uses = DEFAULT_TELECRYSTAL_AMOUNT
 	hidden_uplink.nanoui_menu = 1
 

code/game/objects/items/weapons/cigs_lighters.dm

@@ -230,7 +230,7 @@ CIGARETTE PACKETS ARE IN FANCY.DM
 	if(istype(W, /obj/item/weapon/melee/energy/sword))
 		var/obj/item/weapon/melee/energy/sword/S = W
 		if(S.active)
-			light("<span class='warning'>[user] swings their [W], barely missing their nose. They light their [name] in the process.</span>")
+			light("<span class='warning'>[user] swings their [W], barely missing themselves. They light their [name] in the process.</span>")
 
 	return
 

code/modules/mob/living/carbon/brain/brain_item.dm

@@ -33,6 +33,9 @@
 	icon = 'icons/mob/alien.dmi'
 	icon_state = "chitin"
 
+/obj/item/organ/brain/xeno/gain_trauma()
+	return
+	
 /obj/item/organ/brain/Initialize(mapload)
 	. = ..()
 	health = config.default_brain_health

code/modules/mob/living/silicon/robot/emote.dm

@@ -196,7 +196,7 @@
 
 		if("halt")
 			if (istype(module,/obj/item/weapon/robot_module/security))
-				message = "<B>[src]</B>'s speakers skreech, \"Halt! Security!\"."
+				message = "'s speakers skreech, \"Halt! Security!\"."
 
 				playsound(src.loc, 'sound/voice/halt.ogg', 50, 0)
 				m_type = 2

code/modules/projectiles/guns/energy/magic.dm

@@ -18,6 +18,8 @@
 	charge_meter = 0
 	pin = /obj/item/device/firing_pin/magic
 
+/obj/item/weapon/gun/energy/staff/emp_act(severity) // to prevent it from breaking.
+	return
 
 obj/item/weapon/gun/energy/staff/special_check(var/mob/living/user)
 	if(HULK in user.mutations)

code/modules/projectiles/guns/energy/special.dm

@@ -453,6 +453,7 @@
 					)
 	is_charging = 1
 	if(!do_after(user, 40))
+		is_charging = FALSE
 		return 0
 	is_charging = 0
 	if(!istype(user.get_active_hand(), src))

code/modules/reagents/reagent_containers/dropper.dm

@@ -54,7 +54,7 @@
 
 					if(safe_thing)
 						trans = reagents.trans_to_obj(safe_thing, amount_per_transfer_from_this)
-						user.visible_message("<span class='warning'>[user] tries to squirt something into [target]'s eyes, but fails!</span>", "<span class='notice'>You transfer [trans] units of the solution.</span>")
+						user.visible_message("<span class='warning'>[user] tries to squirt something into [target]'s eyes, but fails!</span>", "<span class='warning'>You try to squirt something into [target]'s eyes, but fail!</span>")
 						return
 
 				trans = reagents.trans_to_mob(target, reagents.total_volume, CHEM_BLOOD)

code/modules/research/xenoarchaeology/finds/finds.dm

@@ -210,6 +210,7 @@
 			new_box.max_w_class = pick(1,2,2,3,3,3,4,4)
 			var/storage_amount = 2**(new_box.max_w_class-1)
 			new_box.max_storage_space = rand(storage_amount, storage_amount * 10)
+			new_box.foldable = null
 			if(prob(30))
 				apply_image_decorations = 1
 		if(12)

html/changelog.html

@@ -56,6 +56,24 @@
 		-->
 		<div class="commit sansserif">
 
+			<h2 class="date">06 April 2018</h2>
+			<h3 class="author">Printer16 updated:</h3>
+			<ul class="changes bgimages16">
+				<li class="bugfix">Ninja uplinks and merc uplinks now work properly. Check your tabs for items that were previously unavailable due to the bug.</li>
+				<li class="bugfix">Traitors can no longer see categories they don't have access to.</li>
+				<li class="bugfix">Updated the diseased touch information to show how much it actually uses.</li>
+				<li class="bugfix">You can no longer fold artifact boxes into cardboard.</li>
+				<li class="bugfix">EMP'ing magical staffs no longer breaks them.</li>
+				<li class="bugfix">The RPED now works properly.</li>
+				<li class="bugfix">Mechs can not use crash if they are in maintenance protocols.</li>
+				<li class="bugfix">Updated the e-sword interaction with cigarettes.</li>
+				<li class="bugfix">Xenos can no longer get brain traumuas.</li>
+				<li class="bugfix">Using *halt as a cyborg no longer displays the name twice.</li>
+				<li class="bugfix">Updated the eyedrop failure message.</li>
+				<li class="bugfix">The thermal drill no longer breaks if you move while charging it.</li>
+				<li class="bugfix">Updated implants to work on station zlevels.</li>
+			</ul>
+
 			<h2 class="date">31 March 2018</h2>
 			<h3 class="author">TheGreatNacho updated:</h3>
 			<ul class="changes bgimages16">

html/changelogs/.all_changelog.yml

@@ -5256,3 +5256,19 @@ DO NOT EDIT THIS FILE BY HAND!  AUTOMATICALLY GENERATED BY ss13_genchangelog.py.
   - bugfix: Fixed lighter being deleted when pulling a cigarette out of it's packet
       with your mouth.
   - bugfix: Fixed spears losing their material after mounting head to them.
+2018-04-06:
+  Printer16:
+  - bugfix: Ninja uplinks and merc uplinks now work properly. Check your tabs for
+      items that were previously unavailable due to the bug.
+  - bugfix: Traitors can no longer see categories they don't have access to.
+  - bugfix: Updated the diseased touch information to show how much it actually uses.
+  - bugfix: You can no longer fold artifact boxes into cardboard.
+  - bugfix: EMP'ing magical staffs no longer breaks them.
+  - bugfix: The RPED now works properly.
+  - bugfix: Mechs can not use crash if they are in maintenance protocols.
+  - bugfix: Updated the e-sword interaction with cigarettes.
+  - bugfix: Xenos can no longer get brain traumuas.
+  - bugfix: Using *halt as a cyborg no longer displays the name twice.
+  - bugfix: Updated the eyedrop failure message.
+  - bugfix: The thermal drill no longer breaks if you move while charging it.
+  - bugfix: Updated implants to work on station zlevels.