Merge branch 'master' of https://github.com/ParadiseSS13/Paradise into fixes

Conflicts:
	_maps/map_files/cyberiad/cyberiad.dmm

code/game/objects/items/devices/radio/intercom.dm

@@ -37,12 +37,16 @@
 /obj/item/device/radio/intercom/attack_ai(mob/user as mob)
 	add_hiddenprint(user)
 	add_fingerprint(user)
-	spawn (0)
+	spawn(0)
+		attack_self(user)
+		
+/obj/item/device/radio/intercom/attack_ghost(mob/user as mob)
+	spawn(0)
 		attack_self(user)
 
 /obj/item/device/radio/intercom/attack_hand(mob/user as mob)
 	add_fingerprint(user)
-	spawn (0)
+	spawn(0)
 		attack_self(user)
 
 /obj/item/device/radio/intercom/receive_range(freq, level)

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

@@ -122,14 +122,9 @@
 	listening = !listening && !(wires.IsIndexCut(WIRE_RECEIVE) || wires.IsIndexCut(WIRE_SIGNAL))
 
 /obj/item/device/radio/Topic(href, href_list)
-	//..()
-	if (usr.stat || !on)
-		return
+	if(..())
+		return 1
 
-	if (!(issilicon(usr) || (usr.contents.Find(src) || ( in_range(src, usr) && istype(loc, /turf) ))))
-		usr << browse(null, "window=radio")
-		return
-	usr.set_machine(src)
 	if (href_list["track"])
 		var/mob/target = locate(href_list["track"])
 		var/mob/living/silicon/ai/A = locate(href_list["track2"])

code/game/objects/items/robot/robot_upgrades.dm

@@ -41,6 +41,7 @@
 	R.jetpackoverlay = 0
 	R.update_icons()
 	R.update_headlamp()
+	R.magpulse = 0
 	R.add_language("Robot Talk", 1)
 
 	return 1

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

@@ -55,8 +55,8 @@
 	..()
 
 /obj/item/weapon/shard/Crossed(AM as mob|obj)
-	if(ismob(AM))
-		var/mob/M = AM
+	if(isliving(AM))
+		var/mob/living/M = AM
 		M << "\red <B>You step on \the [src]!</B>"
 		playsound(src.loc, 'sound/effects/glass_step.ogg', 50, 1) // not sure how to handle metal shards with sounds
 		if(ishuman(M))

code/game/objects/items/weapons/storage/lockbox.dm

@@ -31,6 +31,7 @@
 				else
 					src.icon_state = src.icon_closed
 					user << "\red You unlock the [src.name]!"
+					origin_tech = null //wipe out any origin tech if it's unlocked in any way so you can't double-dip tech levels at R&D.
 					return
 			else
 				user << "\red Access Denied"
@@ -58,6 +59,7 @@
 		desc = "It appears to be broken."
 		icon_state = src.icon_broken
 		user << "<span class='notice'>You unlock \the [src].</span>"
+		origin_tech = null //wipe out any origin tech if it's unlocked in any way so you can't double-dip tech levels at R&D.
 		return
 
 /obj/item/weapon/storage/lockbox/loyalty
@@ -89,7 +91,7 @@
 	item_state = "syringe_kit"
 	w_class = 3
 	max_w_class = 2
-	max_combined_w_class = 20 
+	max_combined_w_class = 20
 	storage_slots = 12
 	req_access = list(access_captain)
 	icon_locked = "medalbox+l"

code/game/objects/structures/curtains.dm

@@ -55,5 +55,8 @@
 /obj/structure/curtain/open/shower/security
 	color = "#AA0000"
 
+/obj/structure/curtain/open/shower/centcom
+	color = "#000066"
+
 #undef SHOWER_OPEN_LAYER
 #undef SHOWER_CLOSED_LAYER

code/game/objects/structures/transit_tubes/station.dm

@@ -6,11 +6,10 @@
 	name = "station tube station"
 	icon = 'icons/obj/pipes/transit_tube_station.dmi'
 	icon_state = "closed"
-	exit_delay = 2
-	enter_delay = 3
+	exit_delay = 1
+	enter_delay = 2
 	var/pod_moving = 0
-	var/automatic_launch_time = 100
-	var/cooldown_delay = 200
+	var/cooldown_delay = 50
 	var/launch_cooldown = 0
 	var/reverse_launch = 0
 

code/game/objects/structures/transit_tubes/transit_tube.dm

@@ -10,8 +10,8 @@
 	layer = 3.1
 	anchored = 1.0
 	var/list/tube_dirs = null
-	var/exit_delay = 2
-	var/enter_delay = 1
+	var/exit_delay = 1
+	var/enter_delay = 0
 
 	// alldirs in global.dm is the same list of directions, but since
 	//  the specific order matters to get a usable icon_state, it is
@@ -20,6 +20,11 @@
 	var/global/list/tube_dir_list = list(NORTH, SOUTH, EAST, WEST, NORTHEAST, NORTHWEST, SOUTHEAST, SOUTHWEST)
 
 
+/obj/structure/transit_tube/CanPass(atom/movable/mover, turf/target)
+	if(istype(mover) && mover.checkpass(PASSGLASS))
+		return 1
+	return !density
+
 // When destroyed by explosions, properly handle contents.
 obj/structure/transit_tube/ex_act(severity)
 	switch(severity)