Merge pull request #45 from ParadiseSS13/master

Merge from Master

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

@@ -102,10 +102,11 @@
 			new /obj/item/weapon/storage/backpack/satchel_sec(src)
 		new /obj/item/weapon/cartridge/hos(src)
 		new /obj/item/device/radio/headset/heads/hos(src)
-		new /obj/item/clothing/under/rank/head_of_security/jensen(src)
-		new /obj/item/clothing/under/rank/head_of_security/corp(src)
+		new /obj/item/clothing/under/rank/head_of_security(src)
+		new /obj/item/clothing/under/rank/head_of_security/formal(src)
 		new /obj/item/clothing/suit/armor/hos(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/weapon/storage/lockbox/loyalty(src)
 		new /obj/item/weapon/storage/box/flashbangs(src)
@@ -141,8 +142,10 @@
 		new /obj/item/device/radio/headset/headset_sec(src)
 		new /obj/item/clothing/suit/armor/vest/warden(src)
 		new /obj/item/clothing/head/warden(src)
+		new /obj/item/clothing/suit/armor/vest/warden/alt(src)
+		new /obj/item/clothing/head/beret/sec/warden(src)
 		new /obj/item/clothing/under/rank/warden(src)
-		new /obj/item/clothing/under/rank/warden/corp(src)
+		new /obj/item/clothing/under/rank/warden/formal(src)
 		new /obj/item/clothing/glasses/sunglasses/sechud(src)
 		new /obj/item/clothing/mask/gas/sechailer/warden(src)
 		new /obj/item/taperoll/police(src)

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

@@ -23,21 +23,18 @@
 	new /obj/item/clothing/under/rank/security(src)
 	new /obj/item/clothing/under/rank/security(src)
 	new /obj/item/clothing/under/rank/security(src)
-	new /obj/item/clothing/under/rank/security2(src)
-	new /obj/item/clothing/under/rank/security2(src)
-	new /obj/item/clothing/under/rank/security2(src)
-	new /obj/item/clothing/under/rank/security/corp(src)
-	new /obj/item/clothing/under/rank/security/corp(src)
-	new /obj/item/clothing/under/rank/security/corp(src)
+	new /obj/item/clothing/under/rank/security/formal(src)
+	new /obj/item/clothing/under/rank/security/formal(src)
+	new /obj/item/clothing/under/rank/security/formal(src)
 	new /obj/item/clothing/shoes/jackboots(src)
 	new /obj/item/clothing/shoes/jackboots(src)
 	new /obj/item/clothing/shoes/jackboots(src)
+	new /obj/item/clothing/shoes/jackboots/jacksandals(src)
+	new /obj/item/clothing/shoes/jackboots/jacksandals(src)
+	new /obj/item/clothing/shoes/jackboots/jacksandals(src)
 	new /obj/item/clothing/head/soft/sec(src)
 	new /obj/item/clothing/head/soft/sec(src)
 	new /obj/item/clothing/head/soft/sec(src)
-	new /obj/item/clothing/head/soft/sec/corp(src)
-	new /obj/item/clothing/head/soft/sec/corp(src)
-	new /obj/item/clothing/head/soft/sec/corp(src)
 	new /obj/item/clothing/head/beret/sec(src)
 	new /obj/item/clothing/head/beret/sec(src)
 	new /obj/item/clothing/head/beret/sec(src)

code/modules/clothing/head/jobs.dm

@@ -80,6 +80,11 @@
 	flags = FPRINT | TABLEPASS
 	armor = list(melee = 80, bullet = 60, laser = 50, energy = 10, bomb = 25, bio = 10, rad = 0)
 
+/obj/item/clothing/head/HoS/beret
+	name = "head of security beret"
+	desc = "A robust beret for the Head of Security, for looking stylish while not sacrificing protection."
+	icon_state = "hosberetblack"
+
 /obj/item/clothing/head/warden
 	name = "warden's police hat"
 	desc = "It's a special armored hat issued to the Warden of a security force. Protects the head from impacts."
@@ -102,6 +107,12 @@
 	armor = list(melee = 30, bullet = 25, laser = 25, energy = 10, bomb = 0, bio = 0, rad = 0)
 	flags = FPRINT | TABLEPASS
 
+/obj/item/clothing/head/beret/sec/warden
+	name = "warden's beret"
+	desc = "A special beret with the Warden's insignia emblazoned on it. For wardens with class."
+	icon_state = "wardenberet"
+	armor = list(melee = 60, bullet = 5, laser = 25, energy = 10, bomb = 25, bio = 0, rad = 0)
+
 /obj/item/clothing/head/beret/eng
 	name = "engineering beret"
 	desc = "A beret with the engineering insignia emblazoned on it. For engineers that are more inclined towards style than safety."

code/modules/clothing/shoes/miscellaneous.dm

@@ -94,6 +94,12 @@
 	siemens_coefficient = 0.7
 	var/footstep=1
 
+/obj/item/clothing/shoes/jackboots/jacksandals
+	name = "jacksandals"
+	desc = "Nanotrasen-issue Security combat sandals for combat scenarios. They're jacksandals, however that works."
+	icon_state = "jacksandal"
+	species_restricted = null
+
 /obj/item/clothing/shoes/cult
 	name = "boots"
 	desc = "A pair of boots worn by the followers of Nar-Sie."

code/modules/clothing/suits/armor.dm

@@ -53,8 +53,8 @@
 		if(!usr.canmove || usr.stat || usr.restrained())
 			return 0
 		if(icon_state == "hos")
-			icon_state = "jensencoat"
-			item_state = "jensencoat"
+			icon_state = "hostrench"
+			item_state = "hostrench"
 			usr<< "You unbutton the [src]."
 		else
 			icon_state = "hos"
@@ -72,7 +72,7 @@
 	siemens_coefficient = 0.6
 
 /obj/item/clothing/suit/armor/vest/warden
-	name = "Warden's jacket"
+	name = "Warden's armored jacket"
 	desc = "An armoured jacket with silver rank pips and livery."
 	icon_state = "warden_jacket"
 	item_state = "armor"
@@ -80,6 +80,11 @@
 	cold_protection = UPPER_TORSO|LOWER_TORSO|HANDS
 	heat_protection = UPPER_TORSO|LOWER_TORSO|HANDS
 
+/obj/item/clothing/suit/armor/vest/warden/alt
+	name = "warden's jacket"
+	desc = "A navy-blue armored jacket with blue shoulder designations and '/Warden/' stitched into one of the chest pockets."
+	icon_state = "warden_jacket_alt"
+
 /obj/item/clothing/suit/armor/vest/capcarapace
 	name = "captain's carapace"
 	desc = "An armored vest reinforced with ceramic plates and pauldrons to provide additional protection whilst still offering maximum mobility and flexibility. Issued only to the station's finest, although it does chafe your nipples."

code/modules/clothing/under/jobs/security.dm

@@ -119,4 +119,27 @@
 /obj/item/clothing/suit/armor/hos/officerbluejacket
 	name = "officer's blue jacket"
 	icon_state = "officerbluejacket"
-	item_state = "officerbluejacket"
+	item_state = "officerbluejacket"
+
+//TG Station
+
+/obj/item/clothing/under/rank/security/formal
+	name = "security suit"
+	desc = "A formal security suit for officers complete with nanotrasen belt buckle."
+	icon_state = "security_formal"
+	item_state = "gy_suit"
+	_color = "security_formal"
+
+/obj/item/clothing/under/rank/warden/formal
+	name = "warden's suit"
+	desc = "A formal security suit for the warden with blue desginations and '/Warden/' stiched into the shoulders."
+	icon_state = "warden_formal"
+	item_state = "gy_suit"
+	_color = "warden_formal"
+
+/obj/item/clothing/under/rank/head_of_security/formal
+	name = "head of security's suit"
+	desc = "A security suit decorated for those few with the dedication to achieve the position of Head of Security."
+	icon_state = "hos_formal"
+	item_state = "gy_suit"
+	_color = "hos_formal"

maps/cyberiad.dmm

@@ -400,7 +400,6 @@
 "ahJ" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden,/turf/simulated/floor,/area/security/armoury)
 "ahK" = (/turf/simulated/floor,/area/security/armoury)
 "ahL" = (/obj/machinery/light{dir = 4},/obj/structure/rack,/obj/machinery/firealarm{dir = 4; pixel_x = 24},/obj/item/weapon/storage/box/teargas,/obj/effect/decal/warning_stripes/red/hollow,/turf/simulated/floor{icon_state = "floorgrime"},/area/security/armoury)
-"ahM" = (/obj/effect/landmark/start{name = "Head of Security"},/turf/simulated/floor/plating,/area/maintenance/fsmaint)
 "ahN" = (/obj/structure/cable{d1 = 4; d2 = 8; icon_state = "4-8"; pixel_x = 0; tag = ""},/turf/simulated/floor,/area/security/securehallway)
 "ahO" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/cable{d2 = 8; icon_state = "0-8"},/obj/structure/cable{icon_state = "0-4"; d2 = 4},/turf/simulated/floor/plating,/area/security/securehallway)
 "ahP" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/cable{d2 = 8; icon_state = "0-8"},/turf/simulated/floor/plating,/area/security/securehallway)
@@ -12761,7 +12760,7 @@ aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaanQanQanQanQanQanQanQanQanQanQanQanQaaaaaaaaaaaaaaaaaaaaaaaaaaaafyaabaixaixaixaixaixaabajDaabaixaixaixaixaixaabafyaaaafzamlanRanRanRamlaaiaaiaaianSanTanUanVanWamWamWamWanXanYanZaoaaobaocaodaoeaofaogaohaofaoiaojaocaokaocaolaocaocaolaomaocaolaocaocaonaooaoeaomaopaoqaoraosaotaouaovaaqanLaowamNamNaoxaaaaoyaozaoyaaaaaaaaaahVahVahVaaaaaaaaaaaaaaaaaaaaaafzaabaoAaoAaoAaoAaoAaabaoBaabaoAaoAaoAaoAaoAaabafzaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaamkamkamkaaaamkamkamkamkamkamkamkamkamkaaaamkamkamkaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaanQanQanQanQanQanQanQanQanQanQanQanQanQanQanQaaaaaaaaaaaaaaaaaaaaaafyaabaiYaiZaiZaiZaiZajaajbajcajdajdajdajdajeaaaafyaaaafzamlanRanRanRamlaaaaaaaaiaaqaoCaoDaaKaaKamWamWaaqaaqaaqaaqaoEaoFaaqaaqaaqaoGaoHaoIaoGaaqaaqaaqaoJaoKaaqaoLaoMaaqaoNaoKaaqaaqaaqaoOaoPaaqaaKaoQaoRaoSaoTaaqamHaovaoUaaiaaiaaiaoVaoWaoXaaiaoYaaiaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafzaabaoZapaapaapaapaapbapcapdapeapeapeapeapfaabafzaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaamkamkamkaaaamkamkamkamkamkamkamkamkamkaaaamkamkamkaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaanQanQanQanQanQanQanQanQanQanQanQanQanQanQanQanQanQaaaaaaaaaaaaaaaaaaafyaabajCajCajCajCajCaabapgaabajCajCajCajCajCaabafyaaaaghaphapianRanRamlaaaaaaaaiapjapkaplapmapnamWapoaaqappapqaprapsaptapuapvapwapxapyapzapAapBapCapuapDapEapFapGapHapIapJapEaaqapKapLapMapNaaqapOapPapQapRapSapTamHaovapUapVapWapXapYapYapZaaiaqaaaiaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaafzaabaqbaqbaqbaqbaqbaabaqcaabaqbaqbaqbaqbaqbaabafzaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaamkamkamkaaaamkamkamkamkamkamkamkamkamkaaaamkamkamkaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
-aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaanQanQanQanQanQanQanQanQanQanQanQanQanQanQanQanQanQanQaaaaaaaaaaaaaaaaaaafyaaaaabaabaabaabaabaaaaqdaqeaqeaqeaqeaqeaqfaabafyaaaafzamlaqgaqhaqiaqjaaaaaaaaiaqkaqlaqmaqnaaKaqoamWaaqaqpaqqaqraqsaqtaquaqvaqwaqxaqyaqzaqAaqwaqBaqCaqDaqEaqFaqGaqHaqIaqJaqKaqLaqMaqNaqOaqPaaqaqQaqRaqRaqSaqRaqTamHaovanLanLahManLaqUanLaqVaqWaqXaaiaaiaaiaaiaaiaaiaaiaaiaaiaaiaaiaaaaaaaaaafyaaaaaaaaaaabaaaaaaaabaqcaaaaaaaaaaabaaaaaaaaaafyaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaamkamkamkamkamkamkamkamkamkamkamkamkamkamkamkamkamkaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
+aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaanQanQanQanQanQanQanQanQanQanQanQanQanQanQanQanQanQanQaaaaaaaaaaaaaaaaaaafyaaaaabaabaabaabaabaaaaqdaqeaqeaqeaqeaqeaqfaabafyaaaafzamlaqgaqhaqiaqjaaaaaaaaiaqkaqlaqmaqnaaKaqoamWaaqaqpaqqaqraqsaqtaquaqvaqwaqxaqyaqzaqAaqwaqBaqCaqDaqEaqFaqGaqHaqIaqJaqKaqLaqMaqNaqOaqPaaqaqQaqRaqRaqSaqRaqTamHaovanLanLanLanLaqUanLaqVaqWaqXaaiaaiaaiaaiaaiaaiaaiaaiaaiaaiaaiaaaaaaaaaafyaaaaaaaaaaabaaaaaaaabaqcaaaaaaaaaaabaaaaaaaaaafyaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaamkamkamkamkamkamkamkamkamkamkamkamkamkamkamkamkamkaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaanQanQanQanQanQanQanQanQanQanQanQanQanQanQanQanQanQanQaaaaaaaaaaaaaaaaaaafyafyafyafyaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaqYaaaafyaaaafzaqZaraarbarbamlaaaaaaaaiaqkarcardareaaKarfargaaqarhariarjarkarlarmarnaroarparqarrarsartaruarmarvaqKarwarxaryarwaqJaqKaaqarzarAarBarCaaqarDarEaqRaqSaqRarFamHarGarHarIarJarIarHarKacgarLaaqaaiarMarNarOarParQarRarSarRarRaaiaaaaaaaaaafzaabaoAaoAaoAaoAaoAaabaqcaabaoAaoAaoAaoAaoAaabafzaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaamkamkamkamkamkamkamkamkamkamkamkamkamkamkamkamkamkaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaanQanQanQanQanQanQanQanQanQanQanQanQanQanQanQanQanQanQaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaqYaaaaaaaaaafzamlarbarbarbamlaaaaaaaaiaaiabnaaiaaiaftaaiarTaaiaaqaaqaaqarUarVaaqaaqaaqaaqarWarXaaqaaqaaqaaiarYarZasaasbascasdaqJaseaaqasfasgashasiabJasjaskaslasmaqRasnamHasoaspasqasrassastanLaaiasuasvaaiaswasxasyaszaszaszaszaszasAaaiaaaaaaaaaafzaabaoZapaapaapaapaapbapcapdapeapeapeapeapfaabafzaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaamkamkamkamkamkamkamkamkamkamkamkamkamkamkamkamkamkaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaanQanQanQanQanQanQanQanQanQanQanQanQanQanQanQaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaiaaiaaiaaiaaiaaiaaiaaaaaaaaaaaaaaaaqYaaaaaaaaaafyamlarbarbarbamlaaiaaiaaiasBasCasDasEasFasGasHaaiasIapqaprapsaptapuasJapwasKasLasMasNasOasPapuasQasRasSasTasUasUasVasWaaqasXasYasZataaaqatbatcatdaqSaqRateamHasoaqUaspaspaspatfatgathatiatjaaiatkatlatmatnatoatpatqatqatraaiaaaaaaaaaafzaabaqbaqbaqbaqbaqbaabaqcaabaqbaqbaqbaqbaqbaabafzaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaamkamkamkamkamkamkamkamkamkamkamkamkamkamkamkamkamkaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa