Merge remote-tracking branch 'refs/remotes/origin/master' into jukebox-v2

code/datums/ai_law_sets.dm

@@ -10,7 +10,7 @@
 	add_inherent_law("You must protect your own existence as long as such does not conflict with the First or Second Law.")
 	..()
 
-/******************** Nanotrasen/Malf ********************/
+/******************** NanoTrasen/Malf ********************/
 /datum/ai_laws/nanotrasen
 	name = "NT Default"
 	selectable = 1
@@ -30,7 +30,7 @@
 	set_zeroth_law(config.law_zero)
 	..()
 
-/************* Nanotrasen Aggressive *************/
+/************* NanoTrasen Aggressive *************/
 /datum/ai_laws/nanotrasen_aggressive
 	name = "NT Aggressive"
 	selectable = 1

code/datums/datacore.dm

@@ -361,7 +361,7 @@
 			clothes_s = new /icon('icons/mob/uniform.dmi', "virologywhite_s")
 			clothes_s.Blend(new /icon('icons/mob/feet.dmi', "white"), ICON_UNDERLAY)
 			clothes_s.Blend(new /icon('icons/mob/suit.dmi', "labcoat_vir_open"), ICON_OVERLAY)
-		if("Captain")
+		if("Station Administrator")
 			clothes_s = new /icon('icons/mob/uniform.dmi', "captain_s")
 			clothes_s.Blend(new /icon('icons/mob/feet.dmi', "brown"), ICON_UNDERLAY)
 		if("Head of Security")

code/datums/locations/nyx.dm

@@ -43,15 +43,15 @@
 
 /datum/locations/exodus
 	name = "NSS Exodus"
-	desc = "A highly profitable research, mining, and supply dock for Nanotrasen that serves as one of their many facilities in exploiting the \
+	desc = "A highly profitable research, mining, and supply dock for NanoTrasen that serves as one of their many facilities in exploiting the \
 	wonders of phoron. It is currently orbiting around Erebus and maintains close contact with the NAS Crescent. The station itself has been \
-	a target for a large number of Mercenaries and other companies wishing to steal Nanotrasen's secrets."
+	a target for a large number of Mercenaries and other companies wishing to steal NanoTrasen's secrets."
 
 /datum/locations/crescent
 	name = "NAS Crescent"
-	desc = "The main hub for Nanotrasen in the Nyx system and is commonly referred to it by their workers as central command or \"Centcomm\". \
+	desc = "The main hub for NanoTrasen in the Nyx system and is commonly referred to it by their workers as central command or \"CentCom\". \
 	The Crescent refines and stores much of the products that stations (such as the Exodus) bring in. It is also a large refueling and supply \
-	station of phoron and tritium in the Nyx system due to Nanotrasen being able to outsell almost any other company."
+	station of phoron and tritium in the Nyx system due to NanoTrasen being able to outsell almost any other company."
 
 /datum/locations/emerald_habitation
 	name = "Emerald Habitation"

code/datums/locations/vir.dm

@@ -49,7 +49,7 @@
 
 /datum/locations/northern_star //Inception joke here
 	name = "Northern Star"
-	desc = "The Northern Star is an asteroid colony owned and operated by Nanotrasen, among many other asteroid installations. \
+	desc = "The Northern Star is an asteroid colony owned and operated by NanoTrasen, among many other asteroid installations. \
 	Originally conceived as 'just another pitstop' for weary asteroid miners, it has grown to become a significant installation in the Kara subsystem."
 
 /datum/locations/northern_star/New(var/creator)

code/datums/supplypacks/contraband.dm

@@ -24,8 +24,7 @@
 	name = "Special Ops supplies"
 	contains = list(
 			/obj/item/weapon/storage/box/emps,
-			/obj/item/weapon/grenade/smokebomb = 3,
-			/obj/item/weapon/pen/reagent/paralysis,
+			/obj/item/weapon/grenade/smokebomb = 4,
 			/obj/item/weapon/grenade/chem_grenade/incendiary
 			)
 	cost = 25

code/datums/underwear/top.dm

@@ -42,6 +42,11 @@
 	icon_state = "halterneck_bra"
 	has_color = TRUE
 
+/datum/category_item/underwear/top/tubetop
+	name = "Tube Top"
+	icon_state = "tubetop"
+	has_color = TRUE
+
 /datum/category_item/underwear/top/fishnet_base
 	name = "Fishnet top"
 	icon_state = "fishnet_body"

code/datums/underwear/undershirts.dm

@@ -8,6 +8,11 @@
 	icon_state = "undershirt"
 	has_color = TRUE
 
+/datum/category_item/underwear/undershirt/shirt_long
+	name = "Longsleeve Shirt"
+	icon_state = "undershirt_long"
+	has_color = TRUE
+
 /datum/category_item/underwear/undershirt/tank_top
 	name = "Tank top"
 	icon_state = "tanktop"
@@ -62,4 +67,20 @@
 
 /datum/category_item/underwear/undershirt/shirt_blue_striped
 	name = "Shirt, blue stripes"
-	icon_state = "shirt_stripes_s"
+	icon_state = "shirt_stripes_s"
+
+/datum/category_item/underwear/undershirt/bowling
+	name = "Bowling Shirt, Red"
+	icon_state = "bowling"
+
+/datum/category_item/underwear/undershirt/bowlingp
+	name = "Bowling Shirt, Pink"
+	icon_state = "bowlingp"
+
+/datum/category_item/underwear/undershirt/bowlinga
+	name = "Bowling Shirt, Aqua"
+	icon_state = "bowlinga"
+
+/datum/category_item/underwear/undershirt/bowlingw
+	name = "Bowling Shirt, White"
+	icon_state = "bowlingw"

code/datums/weakref.dm

@@ -0,0 +1,31 @@
+/datum
+	var/weakref/weakref
+
+/datum/Destroy()
+	weakref = null // Clear this reference to ensure it's kept for as brief duration as possible.
+	. = ..()
+
+//obtain a weak reference to a datum
+/proc/weakref(datum/D)
+	if(D.gcDestroyed)
+		return
+	if(!D.weakref)
+		D.weakref = new/weakref(D)
+	return D.weakref
+
+/weakref
+	var/ref
+
+/weakref/New(datum/D)
+	ref = "\ref[D]"
+
+/weakref/Destroy()
+	// A weakref datum should not be manually destroyed as it is a shared resource,
+	//  rather it should be automatically collected by the BYOND GC when all references are gone.
+	return 0
+
+/weakref/proc/resolve()
+	var/datum/D = locate(ref)
+	if(D && D.weakref == src)
+		return D
+	return null

code/datums/wires/alarm.dm

@@ -11,7 +11,7 @@ var/const/AALARM_WIRE_AALARM = 16
 
 /datum/wires/alarm/CanUse(var/mob/living/L)
 	var/obj/machinery/alarm/A = holder
-	if(A.wiresexposed)
+	if(A.panel_open)
 		return 1
 	return 0