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

code/game/objects/effects/portals.dm

@@ -9,24 +9,18 @@
 	var/obj/item/target = null
 	var/creator = null
 	anchored = 1.0
+	var/precision = 1 // how close to the portal you will teleport. 0 = on the portal, 1 = adjacent
 
 /obj/effect/portal/Bumped(mob/M as mob|obj)
-	spawn(0)
-		src.teleport(M)
-		return
-	return
+	src.teleport(M)
 
-/obj/effect/portal/Crossed(AM as mob|obj)
-	spawn(0)
-		src.teleport(AM)
-		return
-	return
-
-/obj/effect/portal/New()
+/obj/effect/portal/New(loc, turf/target, creator)
 	portals += src
+	src.loc = loc
+	src.target = target
+	src.creator = creator
 	spawn(300)
 		qdel(src)
-		return
 	return
 
 /obj/effect/portal/Destroy()
@@ -34,14 +28,16 @@
 	if(istype(creator, /obj/item/weapon/hand_tele))
 		var/obj/item/weapon/hand_tele/O = creator
 		O.active_portals--
+	else if(istype(creator, /obj/item/weapon/gun/energy/wormhole_projector))
+		var/obj/item/weapon/gun/energy/wormhole_projector/P = creator
+		P.portal_destroyed(src)
+	creator = null
 	return ..()
 
 /obj/effect/portal/proc/teleport(atom/movable/M as mob|obj)
 	if(istype(M, /obj/effect)) //sparks don't teleport
 		return
-	if (M.anchored&&istype(M, /obj/mecha))
-		return
-	if (icon_state == "portal1")
+	if(M.anchored&&istype(M, /obj/mecha))
 		return
 	if (!( target ))
 		qdel(src)
@@ -51,5 +47,4 @@
 			src.icon_state = "portal1"
 			do_teleport(M, locate(rand(5, world.maxx - 5), rand(5, world.maxy -5), 3), 0)
 		else
-			do_teleport(M, target, 1) ///You will appear adjacent to the beacon
-
+			do_teleport(M, target, precision) ///You will appear adjacent to the beacon

code/game/objects/items/weapons/implants/implant.dm

@@ -21,7 +21,10 @@
 // What does the implant do upon injection?
 // return 0 if the implant fails (ex. Revhead and loyalty implant.)
 // return 1 if the implant succeeds (ex. Nonrevhead and loyalty implant.)
-/obj/item/weapon/implant/proc/implanted(var/mob/source)		
+/obj/item/weapon/implant/proc/implanted(var/mob/source)
+	if(istype(source, /mob/living/carbon/human))
+		var/mob/living/carbon/human/H = source
+		H.sec_hud_set_implants()
 	return 1
 
 /obj/item/weapon/implant/proc/get_data()
@@ -55,11 +58,11 @@
 	desc = "Track with this."
 	origin_tech = "materials=2;magnets=2;programming=2;biotech=2"
 	var/id = 1.0
-	
+
 /obj/item/weapon/implant/tracking/New()
 	..()
 	tracking_implants += src
-	
+
 /obj/item/weapon/implant/tracking/Destroy()
 	tracking_implants -= src
 	return ..()
@@ -287,7 +290,7 @@ the implant may become unstable and either pre-maturely inject the subject or si
 	reagents = R
 	R.my_atom = src
 	tracking_implants += src
-	
+
 /obj/item/weapon/implant/chem/Destroy()
 	tracking_implants -= src
 	return ..()
@@ -414,7 +417,7 @@ the implant may become unstable and either pre-maturely inject the subject or si
 	ticker.mode.update_traitor_icons_added(user.mind)
 	log_admin("[ckey(user.key)] has mind-slaved [ckey(H.key)].")
 	return 1
-	
+
 /obj/item/weapon/implant/traitor/islegal()
 	return 0
 

code/game/objects/items/weapons/implants/implanter.dm

@@ -53,7 +53,7 @@
 						var/obj/item/organ/external/affected = H.get_organ(user.zone_sel.selecting)
 						affected.implants += src.imp
 						imp.part = affected
-						H.hud_updateflag |= 1 << IMPLOYAL_HUD
+						H.sec_hud_set_implants()
 				M:implanting = 0
 				src.imp = null
 				update()

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

@@ -46,12 +46,12 @@ Frequency:
 /obj/item/weapon/locator/Topic(href, href_list)
 	if(..())
 		return 1
-		
+
 	var/turf/current_location = get_turf(usr)//What turf is the user on?
 	if(!current_location ||( current_location.z in config.admin_levels))//If turf was not found or they're on z level 2.
 		usr << "<span class='warning'>\The [src] is malfunctioning.</span>"
 		return 1
-		
+
 	if (href_list["refresh"])
 		temp = "<B>Persistent Signal Locator</B><HR>"
 		var/turf/sr = get_turf(src)
@@ -135,9 +135,7 @@ Frequency:
 		return
 	var/T = L[t1]
 	user.show_message("<span class='notice'>Locked In.</span>", 2)
-	var/obj/effect/portal/P = new /obj/effect/portal( get_turf(src) )
-	P.target = T
-	P.creator = src
+	var/obj/effect/portal/P = new /obj/effect/portal(get_turf(src), T, src)
 	try_move_adjacent(P)
 	active_portals++
 	add_fingerprint(user)

code/game/objects/structures/crates_lockers/closets/secure/security.dm

@@ -112,7 +112,7 @@
 		new /obj/item/clothing/suit/armor/hos/alt(src)
 		new /obj/item/clothing/head/HoS(src)
 		new /obj/item/clothing/head/HoS/beret(src)
-		new /obj/item/clothing/glasses/sunglasses/sechud(src)
+		new /obj/item/clothing/glasses/hud/security/sunglasses(src)
 		new /obj/item/weapon/storage/lockbox/loyalty(src)
 		new /obj/item/weapon/storage/box/flashbangs(src)
 		new /obj/item/clothing/mask/gas/sechailer/swat(src)
@@ -151,7 +151,7 @@
 		new /obj/item/clothing/under/rank/warden(src)
 		new /obj/item/clothing/under/rank/warden/formal(src)
 		new /obj/item/clothing/under/rank/warden/corp(src)
-		new /obj/item/clothing/glasses/sunglasses/sechud(src)
+		new /obj/item/clothing/glasses/hud/security/sunglasses(src)
 		new /obj/item/clothing/mask/gas/sechailer(src)
 		new /obj/item/taperoll/police(src)
 		new /obj/item/weapon/storage/box/zipties(src)
@@ -190,7 +190,7 @@
 		new /obj/item/weapon/grenade/flashbang(src)
 		new /obj/item/weapon/storage/belt/security/sec(src)
 		new /obj/item/clothing/mask/gas/sechailer(src)
-		new /obj/item/clothing/glasses/sunglasses/sechud(src)
+		new /obj/item/clothing/glasses/hud/security/sunglasses(src)
 		new /obj/item/clothing/head/helmet(src)
 		new /obj/item/weapon/melee/baton/loaded(src)
 		new /obj/item/taperoll/police(src)
@@ -248,7 +248,7 @@
 		new /obj/item/weapon/restraints/handcuffs(src)
 		new /obj/item/weapon/melee/baton/loaded(src)
 		new /obj/item/clothing/glasses/sunglasses(src)
-		new /obj/item/clothing/glasses/hud/health_advanced
+		new /obj/item/clothing/glasses/hud/health/health_advanced
 		new /obj/item/clothing/head/beret/centcom/officer(src)
 		new /obj/item/clothing/suit/armor/vest/blueshield(src)
 		new /obj/item/clothing/suit/storage/blueshield(src)

code/game/objects/structures/crates_lockers/closets/wardrobe.dm

@@ -346,6 +346,8 @@
 /obj/structure/closet/wardrobe/robotics_black/New()
 	..()
 	sleep(2)
+	new /obj/item/clothing/glasses/hud/diagnostic(src)
+	new /obj/item/clothing/glasses/hud/diagnostic(src)
 	new /obj/item/clothing/under/rank/roboticist(src)
 	new /obj/item/clothing/under/rank/roboticist(src)
 	new /obj/item/clothing/suit/storage/labcoat(src)