Polaris December Sync

code/datums/supplypacks/munitions.dm

@@ -47,7 +47,7 @@
 	access = access_armory
 
 /datum/supply_packs/munitions/energyweapons
-	name = "Energy weapons crate"
+	name = "Laser carbine crate"
 	contains = list(/obj/item/weapon/gun/energy/laser = 3)
 	cost = 50
 	containertype = /obj/structure/closet/crate/secure
@@ -98,11 +98,11 @@
 	access = access_armory
 
 /datum/supply_packs/munitions/energy_guns
-	name = "energy guns crate"
+	name = "Energy gun crate"
 	contains = list(/obj/item/weapon/gun/energy/gun = 2)
 	cost = 50
 	containertype = /obj/structure/closet/crate/secure
-	containername = "energy guns crate"
+	containername = "Energy gun crate"
 	access = access_armory
 
 /datum/supply_packs/munitions/bolt_rifles_competitive

code/datums/supplypacks/robotics.dm

@@ -24,7 +24,7 @@
 	containername = "Robotics assembly"
 	access = access_robotics
 
-/datum/supply_packs/robotics/robolimbs_basic
+/*/datum/supply_packs/robotics/robolimbs_basic
 	name = "Basic robolimb blueprints"
 	contains = list(
 			/obj/item/weapon/disk/limb/morpheus,
@@ -50,6 +50,55 @@
 	containertype = /obj/structure/closet/crate/secure/gear
 	containername = "Robolimb blueprints (adv)"
 	access = access_robotics
+*/
+
+/datum/supply_packs/robotics/robolimbs/morpheus
+	name = "Morpheus robolimb blueprints"
+	contains = list(/obj/item/weapon/disk/limb/morpheus)
+	cost = 20
+	containertype = /obj/structure/closet/crate/secure/gear
+	containername = "Robolimb blueprints (Morpheus)"
+	access = access_robotics
+
+/datum/supply_packs/robotics/robolimbs/xion
+	name = "Xion robolimb blueprints"
+	contains = list(/obj/item/weapon/disk/limb/xion)
+	cost = 20
+	containertype = /obj/structure/closet/crate/secure/gear
+	containername = "Robolimb blueprints (Xion)"
+	access = access_robotics
+
+/datum/supply_packs/robotics/robolimbs/wardtakahashi
+	name = "Ward-Takahashi robolimb blueprints"
+	contains = list(/obj/item/weapon/disk/limb/wardtakahashi)
+	cost = 35
+	containertype = /obj/structure/closet/crate/secure/gear
+	containername = "Robolimb blueprints (Ward-Takahashi)"
+	access = access_robotics
+
+/datum/supply_packs/robotics/robolimbs/zenghu
+	name = "Zeng Hu robolimb blueprints"
+	contains = list(/obj/item/weapon/disk/limb/zenghu)
+	cost = 35
+	containertype = /obj/structure/closet/crate/secure/gear
+	containername = "Robolimb blueprints (Zeng Hu)"
+	access = access_robotics
+
+/datum/supply_packs/robotics/robolimbs/bishop
+	name = "Bishop robolimb blueprints"
+	contains = list(/obj/item/weapon/disk/limb/bishop)
+	cost = 70
+	containertype = /obj/structure/closet/crate/secure/gear
+	containername = "Robolimb blueprints (Bishop)"
+	access = access_robotics
+
+/datum/supply_packs/robotics/robolimbs/veymed
+	name = "Vey-Med robolimb blueprints"
+	contains = list(/obj/item/weapon/disk/limb/veymed)
+	cost = 70
+	containertype = /obj/structure/closet/crate/secure/gear
+	containername = "Robolimb blueprints (Vey-Med)"
+	access = access_robotics
 
 /datum/supply_packs/robotics/mecha_ripley
 	name = "Circuit Crate (\"Ripley\" APLU)"

code/datums/supplypacks/voidsuits.dm

@@ -21,6 +21,20 @@
 	containername = "Atmospheric voidsuit crate"
 	access = access_atmospherics
 
+/datum/supply_packs/voidsuits/atmos/alt
+	name = "Heavy Duty Atmospheric voidsuits"
+	contains = list(
+			/obj/item/clothing/suit/space/void/atmos/alt = 2,
+			/obj/item/clothing/head/helmet/space/void/atmos/alt = 2,
+			/obj/item/clothing/mask/breath = 2,
+			/obj/item/clothing/shoes/magboots = 2,
+			/obj/item/weapon/tank/oxygen = 2,
+			)
+	cost = 50
+	containertype = "/obj/structure/closet/crate/secure"
+	containername = "Heavy Duty Atmospheric voidsuit crate"
+	access = access_atmospherics
+
 /datum/supply_packs/voidsuits/engineering
 	name = "Engineering voidsuits"
 	contains = list(
@@ -35,6 +49,48 @@
 	containername = "Engineering voidsuit crate"
 	access = access_engine_equip
 
+/datum/supply_packs/voidsuits/engineering/construction
+	name = "Engineering Construction voidsuits"
+	contains = list(
+			/obj/item/clothing/suit/space/void/engineering/construction = 2,
+			/obj/item/clothing/head/helmet/space/void/engineering/construction = 2,
+			/obj/item/clothing/mask/breath = 2,
+			/obj/item/clothing/shoes/magboots = 2,
+			/obj/item/weapon/tank/oxygen = 2
+			)
+	cost = 40
+	containertype = "/obj/structure/closet/crate/secure"
+	containername = "Engineering Construction voidsuit crate"
+	access = access_engine_equip
+
+/datum/supply_packs/voidsuits/engineering/hazmat
+	name = "Engineering Hazmat voidsuits"
+	contains = list(
+			/obj/item/clothing/suit/space/void/engineering/hazmat = 2,
+			/obj/item/clothing/head/helmet/space/void/engineering/hazmat = 2,
+			/obj/item/clothing/mask/breath = 2,
+			/obj/item/clothing/shoes/magboots = 2,
+			/obj/item/weapon/tank/oxygen = 2
+			)
+	cost = 45
+	containertype = "/obj/structure/closet/crate/secure"
+	containername = "Engineering Hazmat voidsuit crate"
+	access = access_engine_equip
+
+/datum/supply_packs/voidsuits/engineering/alt
+	name = "Reinforced Engineering voidsuits"
+	contains = list(
+			/obj/item/clothing/suit/space/void/engineering/alt = 2,
+			/obj/item/clothing/head/helmet/space/void/engineering/alt = 2,
+			/obj/item/clothing/mask/breath = 2,
+			/obj/item/clothing/shoes/magboots = 2,
+			/obj/item/weapon/tank/oxygen = 2
+			)
+	cost = 50
+	containertype = "/obj/structure/closet/crate/secure"
+	containername = "Reinforced Engineering voidsuit crate"
+	access = access_engine_equip
+
 /datum/supply_packs/voidsuits/medical
 	name = "Medical voidsuits"
 	contains = list(
@@ -49,6 +105,48 @@
 	containername = "Medical voidsuit crate"
 	access = access_medical_equip
 
+/datum/supply_packs/voidsuits/medical/emt
+	name = "Medical EMT voidsuits"
+	contains = list(
+			/obj/item/clothing/suit/space/void/medical/emt = 2,
+			/obj/item/clothing/head/helmet/space/void/medical/emt = 2,
+			/obj/item/clothing/mask/breath = 2,
+			/obj/item/clothing/shoes/magboots = 2,
+			/obj/item/weapon/tank/oxygen = 2
+			)
+	cost = 40
+	containertype = "/obj/structure/closet/crate/secure"
+	containername = "Medical EMT voidsuit crate"
+	access = access_medical_equip
+
+/datum/supply_packs/voidsuits/medical/bio
+	name = "Medical Biohazard voidsuits"
+	contains = list(
+			/obj/item/clothing/suit/space/void/medical/bio = 2,
+			/obj/item/clothing/head/helmet/space/void/medical/bio = 2,
+			/obj/item/clothing/mask/breath = 2,
+			/obj/item/clothing/shoes/magboots = 2,
+			/obj/item/weapon/tank/oxygen = 2
+			)
+	cost = 45
+	containertype = "/obj/structure/closet/crate/secure"
+	containername = "Medical Biohazard voidsuit crate"
+	access = access_medical_equip
+
+/datum/supply_packs/voidsuits/medical/alt
+	name = "Vey-Med Medical voidsuits"
+	contains = list(
+			/obj/item/clothing/suit/space/void/medical/alt = 2,
+			/obj/item/clothing/head/helmet/space/void/medical/alt = 2,
+			/obj/item/clothing/mask/breath = 2,
+			/obj/item/clothing/shoes/magboots = 2,
+			/obj/item/weapon/tank/oxygen = 2
+			)
+	cost = 50
+	containertype = "/obj/structure/closet/crate/secure"
+	containername = "Vey-Med Medical voidsuit crate"
+	access = access_medical_equip
+
 /datum/supply_packs/voidsuits/security
 	name = "Security voidsuits"
 	contains = list(
@@ -62,6 +160,32 @@
 	containertype = "/obj/structure/closet/crate/secure"
 	containername = "Security voidsuit crate"
 
+/datum/supply_packs/voidsuits/security/crowd
+	name = "Security Crowd Control voidsuits"
+	contains = list(
+			/obj/item/clothing/suit/space/void/security/riot = 2,
+			/obj/item/clothing/head/helmet/space/void/security/riot = 2,
+			/obj/item/clothing/mask/breath = 2,
+			/obj/item/clothing/shoes/magboots = 2,
+			/obj/item/weapon/tank/oxygen = 2
+			)
+	cost = 40
+	containertype = "/obj/structure/closet/crate/secure"
+	containername = "Security Crowd Control voidsuit crate"
+
+/datum/supply_packs/voidsuits/security/alt
+	name = "Security EVA Riot voidsuits"
+	contains = list(
+			/obj/item/clothing/suit/space/void/security/alt = 2,
+			/obj/item/clothing/head/helmet/space/void/security/alt = 2,
+			/obj/item/clothing/mask/breath = 2,
+			/obj/item/clothing/shoes/magboots = 2,
+			/obj/item/weapon/tank/oxygen = 2
+			)
+	cost = 50
+	containertype = "/obj/structure/closet/crate/secure"
+	containername = "Security EVA Riot voidsuit crate"
+
 /datum/supply_packs/voidsuits/supply
 	name = "Mining voidsuits"
 	contains = list(
@@ -73,4 +197,17 @@
 	cost = 40
 	containertype = "/obj/structure/closet/crate/secure"
 	containername = "Mining voidsuit crate"
+	access = access_mining
+
+/datum/supply_packs/voidsuits/supply/alt
+	name = "Frontier Mining voidsuits"
+	contains = list(
+			/obj/item/clothing/suit/space/void/mining/alt = 2,
+			/obj/item/clothing/head/helmet/space/void/mining/alt = 2,
+			/obj/item/clothing/mask/breath = 2,
+			/obj/item/weapon/tank/oxygen = 2
+			)
+	cost = 50
+	containertype = "/obj/structure/closet/crate/secure"
+	containername = "Frontier Mining voidsuit crate"
 	access = access_mining

code/datums/underwear/undershirts.dm

@@ -8,11 +8,21 @@
 	icon_state = "undershirt"
 	has_color = TRUE
 
+/datum/category_item/underwear/undershirt/shirt_fem
+	name = "Babydoll shirt"
+	icon_state = "undershirt_fem"
+	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/shirt_long_fem
+	name = "Longsleeve Shirt, feminine"
+	icon_state = "undershirt_long_fem"
+	has_color = TRUE
+
 /datum/category_item/underwear/undershirt/tank_top
 	name = "Tank top"
 	icon_state = "tanktop"
@@ -23,27 +33,59 @@
 	icon_state = "tanktop_alt"
 	has_color = TRUE
 
+/datum/category_item/underwear/undershirt/tank_top_alt_fem
+	name = "Tank top, alt, feminine"
+	icon_state = "tanktop_alt_fem"
+	has_color = TRUE
+
+/datum/category_item/underwear/undershirt/tank_top_alt_fem_vneck
+	name = "Tank top, feminine, v-neck"
+	icon_state = "tanktop_alt_fem_vneck"
+	has_color = TRUE
+
 /datum/category_item/underwear/undershirt/tank_top_fire
 	name = "Tank top, fire"
 	icon_state = "tank_fire_s"
 
+/datum/category_item/underwear/undershirt/tank_top_fire_fem
+	name = "Tank top, fire, feminine"
+	icon_state = "tank_fire_fem_s"
+
 /datum/category_item/underwear/undershirt/shirt_heart
 	name = "Shirt, heart"
 	icon_state = "lover_s"
 
+/datum/category_item/underwear/undershirt/shirt_heart_fem
+	name = "Shirt, heart, babydoll"
+	icon_state = "lover_fem_s"
+
 /datum/category_item/underwear/undershirt/shirt_nt
 	name = "Shirt, NT"
 	icon_state = "shirt_nano_s"
 
 /datum/category_item/underwear/undershirt/shirt_love_nt
 	name = "Shirt, I<3NT"
-	icon_state = "lover_s"
+	icon_state = "ilovent_s"
+
+/datum/category_item/underwear/undershirt/shirt_love_nt_fem
+	name = "Shirt, I<3NT, babydoll"
+	icon_state = "ilovent_fem_s"
 
 /datum/category_item/underwear/undershirt/shortsleeve_shirt
 	name = "Shortsleeve shirt"
 	icon_state = "shortsleeve"
 	has_color = TRUE
 
+/datum/category_item/underwear/undershirt/shortsleeve_shirt_fem
+	name = "Shortsleeve babydoll shirt"
+	icon_state = "shortsleeve_fem"
+	has_color = TRUE
+
+/datum/category_item/underwear/undershirt/shortsleeve_shirt_fem_vneck
+	name = "Shortsleeve babydoll shirt, v-neck"
+	icon_state = "shortsleeve_fem_vneck"
+	has_color = TRUE
+
 /datum/category_item/underwear/undershirt/polo_shirt
 	name = "Polo shirt"
 	icon_state = "polo"

code/datums/underwear/underwear.dm

@@ -67,7 +67,7 @@ datum/category_group/underwear/dd_SortValue()
 	if(!icon_state)
 		return
 
-	var/image/I = image(icon = 'icons/mob/human.dmi', icon_state = icon_state)
+	var/image/I = image(icon = icon, icon_state = icon_state)
 	for(var/datum/gear_tweak/gt in tweaks)
 		gt.tweak_item(I, metadata && metadata["[gt]"] ? metadata["[gt]"] : gt.get_default())
 	return I

code/datums/uplink/ammunition.dm

@@ -18,14 +18,26 @@
 	name = "Pistol Magazine (.45)"
 	path = /obj/item/ammo_magazine/c45m
 
+/datum/uplink_item/item/ammo/c45map
+	name = "Pistol Magazine (.45 AP)"
+	path = /obj/item/ammo_magazine/c45m/ap
+
 /datum/uplink_item/item/ammo/tommymag
 	name = "Tommygun Magazine (.45)"
 	path = /obj/item/ammo_magazine/tommymag
 
+/datum/uplink_item/item/ammo/tommymagap
+	name = "Tommygun Magazine (.45 AP)"
+	path = /obj/item/ammo_magazine/tommymag/ap
+
 /datum/uplink_item/item/ammo/tommydrum
 	name = "Tommygun Drum Magazine (.45)"
 	path = /obj/item/ammo_magazine/tommydrum
-	item_cost = 40 // Buy 40 bullets, get 10 free!
+	item_cost = 40
+
+/datum/uplink_item/item/ammo/tommydrumap
+	name = "Tommygun Drum Magazine (.45 AP)"
+	path = /obj/item/ammo_magazine/tommydrum/ap
 
 /datum/uplink_item/item/ammo/darts
 	name = "Darts"

code/datums/uplink/badassery.dm

@@ -3,6 +3,7 @@
 ************/
 /datum/uplink_item/item/badassery
 	category = /datum/uplink_category/badassery
+	blacklisted = 1
 
 /datum/uplink_item/item/badassery/balloon
 	name = "For showing that You Are The BOSS (Useless Balloon)"
@@ -19,7 +20,6 @@
 /datum/uplink_item/item/badassery/random_one
 	name = "Random Item"
 	desc = "Buys you one random item."
-	blacklisted = 1
 
 /datum/uplink_item/item/badassery/random_one/buy(var/obj/item/device/uplink/U, var/mob/user)
 	var/datum/uplink_item/item = default_uplink_selection.get_random_item(U.uses)