diff --git a/_maps/configs/syndicate_gorlex_komodo.json b/_maps/configs/syndicate_gorlex_komodo.json index 73ce92630014..2bc7a358b754 100644 --- a/_maps/configs/syndicate_gorlex_komodo.json +++ b/_maps/configs/syndicate_gorlex_komodo.json @@ -33,7 +33,7 @@ "slots": 1 }, "Mechanic": { - "outfit": "/datum/outfit/job/syndicate/miner/gorlex", + "outfit": "/datum/outfit/job/syndicate/engineer/gorlex", "slots": 1 }, "Trooper": { @@ -45,7 +45,7 @@ "slots": 2 }, "Bridge Officer": { - "outfit": "/datum/outfit/job/syndicate/head_of_personnel", + "outfit": "/datum/outfit/job/syndicate/head_of_personnel/cybersun", "slots": 1 } }, diff --git a/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm b/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm index fc7e7a029b82..445b6391a30d 100644 --- a/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm +++ b/_maps/shuttles/syndicate/syndicate_gorlex_komodo.dmm @@ -188,17 +188,16 @@ /turf/open/floor/plating/rust, /area/ship/maintenance/starboard) "dD" = ( -/obj/item/clothing/shoes/jackboots, /obj/item/clothing/mask/gas/syndicate, /obj/effect/turf_decal/techfloor{ dir = 10 }, -/obj/item/clothing/head/beret/black, -/obj/item/clothing/under/syndicate, /obj/structure/closet/syndicate{ desc = "It's a basic storage unit."; name = "uniform closet" }, +/obj/item/clothing/shoes/combat, +/obj/item/clothing/under/syndicate/hardliners, /turf/open/floor/mineral/plastitanium, /area/ship/hallway/central) "dG" = ( @@ -372,21 +371,21 @@ pixel_x = -12; pixel_y = 7 }, -/obj/item/clothing/under/syndicate/sniper, /obj/item/clothing/shoes/combat, /obj/item/clothing/mask/gas/syndicate, -/obj/item/clothing/suit/armor/vest/duster, /obj/structure/closet/secure_closet/wall/directional/south{ icon_state = "sec_wall"; name = "Bridge Officer's Locker"; req_access_txt = "57" }, /obj/item/melee/classic_baton/telescopic, -/obj/item/clothing/neck/chameleon, /obj/item/radio/headset/syndicate, /obj/item/megaphone{ pixel_x = -2 }, +/obj/item/clothing/under/syndicate/cybersun/officer, +/obj/item/clothing/suit/cybersun_suit, +/obj/item/clothing/head/HoS/cybersun, /turf/open/floor/plasteel/dark, /area/ship/bridge) "eN" = ( @@ -653,12 +652,10 @@ dir = 1; layer = 2.8 }, -/obj/item/clothing/shoes/jackboots, /obj/item/clothing/mask/gas/syndicate, /obj/effect/turf_decal/techfloor{ dir = 8 }, -/obj/item/clothing/under/syndicate, /obj/structure/closet/syndicate{ desc = "It's a basic storage unit."; name = "uniform closet" @@ -668,6 +665,8 @@ pixel_x = -23; pixel_y = 4 }, +/obj/item/clothing/shoes/combat, +/obj/item/clothing/under/syndicate/hardliners, /turf/open/floor/mineral/plastitanium, /area/ship/hallway/central) "hk" = ( @@ -1156,8 +1155,6 @@ /obj/structure/closet/wall/orange/directional/south{ name = "Engineering locker" }, -/obj/item/clothing/under/syndicate/coldres, -/obj/item/clothing/suit/toggle/industrial, /obj/item/clothing/shoes/workboots, /obj/item/clothing/head/welding, /obj/item/clothing/head/hardhat/red, @@ -1174,6 +1171,8 @@ /obj/structure/cable{ icon_state = "1-4" }, +/obj/item/clothing/under/syndicate/hardliners, +/obj/item/clothing/suit/hazardvest/hardliners, /turf/open/floor/plasteel/tech, /area/ship/engineering) "ls" = ( @@ -2880,11 +2879,6 @@ /obj/item/ammo_box/magazine/m10mm, /obj/item/ammo_box/c10mm, /obj/item/clothing/gloves/tackler/combat/insulated, -/obj/item/clothing/suit/armor/vest/leather{ - desc = "Lightly armored leather overcoat meant as casual wear for high-ranking officers. Bears the crest of the Gorlex Marauders." - }, -/obj/item/clothing/mask/gas/sechailer/swat, -/obj/item/clothing/head/HoS/beret/syndicate, /obj/structure/closet/secure_closet/wall/directional/west{ icon_state = "sec_wall"; name = "Sergeant's Locker"; @@ -2892,11 +2886,12 @@ }, /obj/item/melee/classic_baton/telescopic, /obj/item/clothing/suit/armor/vest/blueshirt, -/obj/item/clothing/under/syndicate/combat, -/obj/item/clothing/under/syndicate, /obj/item/clothing/accessory/holster, /obj/item/clothing/shoes/combat, /obj/item/radio/headset/syndicate, +/obj/item/clothing/under/syndicate/hardliners/officer, +/obj/item/clothing/suit/armor/hardliners/sergeant, +/obj/item/clothing/head/hardliners/peaked, /turf/open/floor/plasteel/dark, /area/ship/bridge) "AS" = ( @@ -3124,18 +3119,17 @@ name = "captain's locker"; req_access_txt = "20" }, -/obj/item/clothing/under/syndicate/combat, -/obj/item/clothing/suit/armor/vest/capcarapace/syndicate, /obj/item/clothing/gloves/krav_maga/combatglovesplus, -/obj/item/clothing/shoes/jackboots, /obj/item/clothing/glasses/thermal/eyepatch, -/obj/item/clothing/head/HoS/beret/syndicate, -/obj/item/clothing/head/HoS/syndicate, /obj/item/gun/ballistic/revolver, /obj/item/clothing/under/syndicate/sniper, /obj/item/ammo_box/a357, /obj/item/ammo_box/a357, /obj/item/radio/headset/syndicate/alt/leader, +/obj/item/clothing/shoes/combat, +/obj/item/clothing/under/syndicate/hardliners/officer, +/obj/item/clothing/suit/toggle/armor/vest/hardliners, +/obj/item/clothing/head/hardliners/peaked, /turf/open/floor/carpet/black, /area/ship/bridge) "El" = ( @@ -3347,7 +3341,6 @@ }, /area/ship/maintenance/starboard) "GD" = ( -/obj/item/clothing/shoes/jackboots, /obj/item/clothing/mask/gas/syndicate, /obj/machinery/atmospherics/components/unary/vent_pump/on/layer2{ dir = 4 @@ -3356,11 +3349,12 @@ dir = 9 }, /obj/item/clothing/mask/balaclava, -/obj/item/clothing/under/syndicate/gorlex, /obj/structure/closet/syndicate{ desc = "It's a basic storage unit."; name = "uniform closet" }, +/obj/item/clothing/shoes/combat, +/obj/item/clothing/under/syndicate/hardliners, /turf/open/floor/mineral/plastitanium, /area/ship/hallway/central) "GJ" = ( @@ -3845,7 +3839,6 @@ /turf/open/floor/mineral/plastitanium, /area/ship/hallway/aft) "Lb" = ( -/obj/item/clothing/shoes/jackboots, /obj/item/clothing/neck/scarf/red, /obj/item/clothing/mask/bandana/skull, /obj/item/clothing/mask/gas/syndicate, @@ -3855,11 +3848,12 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 }, -/obj/item/clothing/under/utility, /obj/structure/closet/syndicate{ desc = "It's a basic storage unit."; name = "uniform closet" }, +/obj/item/clothing/shoes/combat, +/obj/item/clothing/under/syndicate/hardliners/jumpsuit, /turf/open/floor/mineral/plastitanium, /area/ship/hallway/central) "Lj" = ( @@ -4064,21 +4058,16 @@ /obj/effect/turf_decal/techfloor{ dir = 9 }, -/obj/item/clothing/under/syndicate/skirt, /obj/structure/closet/syndicate{ desc = "It's a basic storage unit."; name = "uniform closet" }, +/obj/item/clothing/shoes/combat, +/obj/item/clothing/under/syndicate/hardliners/jumpsuit, /turf/open/floor/mineral/plastitanium, /area/ship/hallway/central) "Ni" = ( /obj/effect/turf_decal/industrial/warning, -/obj/item/clothing/suit/armor/vest/syndie, -/obj/item/clothing/suit/armor/vest/syndie, -/obj/item/clothing/suit/armor/vest/syndie, -/obj/item/clothing/head/helmet/operator, -/obj/item/clothing/head/helmet/operator, -/obj/item/clothing/head/helmet/operator, /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 4 }, @@ -4090,9 +4079,21 @@ name = "Armor Locker"; req_access_txt = "1" }, -/obj/item/storage/belt/military, -/obj/item/storage/belt/military, -/obj/item/storage/belt/military, +/obj/item/clothing/suit/armor/hardliners/jacket, +/obj/item/clothing/suit/armor/hardliners/jacket, +/obj/item/clothing/suit/armor/hardliners/jacket, +/obj/item/clothing/suit/armor/hardliners, +/obj/item/clothing/suit/armor/hardliners, +/obj/item/clothing/suit/armor/hardliners, +/obj/item/clothing/head/helmet/hardliners, +/obj/item/clothing/head/helmet/hardliners, +/obj/item/clothing/head/helmet/hardliners, +/obj/item/storage/belt/security/webbing/hardliners, +/obj/item/storage/belt/security/webbing/hardliners, +/obj/item/storage/belt/security/webbing/hardliners, +/obj/item/clothing/glasses/hud/security/sunglasses/hardliners, +/obj/item/clothing/glasses/hud/security/sunglasses/hardliners, +/obj/item/clothing/glasses/hud/security/sunglasses/hardliners, /turf/open/floor/mineral/plastitanium/red, /area/ship/security/armory) "Nj" = ( @@ -4271,7 +4272,6 @@ /turf/open/floor/plasteel/telecomms_floor, /area/ship/cargo) "PE" = ( -/obj/structure/chair/comfy, /obj/effect/decal/cleanable/dirt/dust, /obj/effect/turf_decal/trimline/transparent/bar/filled/line{ dir = 8 @@ -4281,6 +4281,7 @@ pixel_y = -1 }, /obj/machinery/airalarm/directional/west, +/obj/structure/chair/comfy/red, /turf/open/floor/mineral/plastitanium, /area/ship/crew/canteen) "PG" = ( @@ -5096,17 +5097,17 @@ /area/ship/hallway/central) "WQ" = ( /obj/structure/railing, -/obj/item/clothing/shoes/jackboots, /obj/item/clothing/mask/gas/syndicate, /obj/effect/turf_decal/techfloor{ dir = 8 }, /obj/item/clothing/mask/balaclava, -/obj/item/clothing/under/syndicate/gorlex, /obj/structure/closet/syndicate{ desc = "It's a basic storage unit."; name = "uniform closet" }, +/obj/item/clothing/shoes/combat, +/obj/item/clothing/under/syndicate/hardliners, /turf/open/floor/mineral/plastitanium, /area/ship/hallway/central) "WR" = ( @@ -5426,12 +5427,8 @@ /obj/structure/cable{ icon_state = "1-8" }, -/obj/item/clothing/under/utility, /obj/item/clothing/suit/longcoat/roboblack, -/obj/item/clothing/suit/apron/surgical, -/obj/item/clothing/neck/stethoscope, /obj/item/clothing/mask/surgical, -/obj/item/clothing/head/beret/black, /obj/item/clothing/gloves/color/latex/nitrile/evil{ pixel_x = 1; pixel_y = -3 @@ -5442,6 +5439,9 @@ pixel_x = -3; pixel_y = 3 }, +/obj/item/clothing/suit/hardliners, +/obj/item/clothing/head/hardliners, +/obj/item/clothing/under/syndicate/hardliners, /turf/open/floor/mineral/plastitanium, /area/ship/medical) "Zy" = ( diff --git a/code/modules/clothing/factions/hardliners.dm b/code/modules/clothing/factions/hardliners.dm new file mode 100644 index 000000000000..5c3423f745c0 --- /dev/null +++ b/code/modules/clothing/factions/hardliners.dm @@ -0,0 +1,181 @@ +////////////// +//Jumpsuits// +///////////// + +/obj/item/clothing/under/syndicate/hardliners + name = "hardliners uniform" + desc = "A crimson combat uniform, reminiscent of the Gorlex Marauders at the height of the Inter-Corporate Wars. It's oddly comfortable, and warm." + icon_state = "hardliners" + item_state = "hardliners" + armor = list("melee" = 10, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 40) + can_adjust = FALSE + icon = 'icons/obj/clothing/faction/hardliners/uniforms.dmi' + mob_overlay_icon = 'icons/mob/clothing/faction/hardliners/uniforms.dmi' + +/obj/item/clothing/under/syndicate/hardliners/jumpsuit + name = "hardliners jumpsuit" + desc = "A black jumpsuit with white overalls, a scant reminder of the old miners of Gorlex VII." + icon_state = "hl_jumpsuit" + item_state = "hl_jumpsuit" + +/obj/item/clothing/under/syndicate/hardliners/officer + name = "hardliners officer uniform" + desc = "A button-up uniform with cargo pants, certainly more tactical than most officer uniforms." + icon_state = "hl_officer" + item_state = "hl_officer" + +//////////////////// +//Unarmored suits// +/////////////////// + +/obj/item/clothing/suit/hardliners + name = "white smock" + desc = "A plain-white surgical smock typically worn by both Hardliners and Cybersun staff. Even mercenaries need medical attention!" + icon = 'icons/obj/clothing/faction/hardliners/suits.dmi' + mob_overlay_icon = 'icons/mob/clothing/faction/hardliners/suits.dmi' + icon_state = "hl_apron" + item_state = "whitecloth" + +/obj/item/clothing/suit/hazardvest/hardliners + name = "blood-red hazard vest" + desc = "A white high-visibility vest, worn by mechanics associated with Hardliners. Safety first!" + icon = 'icons/obj/clothing/faction/hardliners/suits.dmi' + mob_overlay_icon = 'icons/mob/clothing/faction/hardliners/suits.dmi' + icon_state = "hl_hazard" + item_state = "whitecloth" + +////////////////// +//Armored suits// +///////////////// + +/obj/item/clothing/suit/armor/hardliners + name = "hardliners armor vest" + desc = "A slim Type I armored vest, painted in a classic white associated with the Hardliners. It would probably make bloodstains very obvious..." + icon_state = "hl_vest" + item_state = "armor" + icon = 'icons/obj/clothing/faction/hardliners/suits.dmi' + mob_overlay_icon = 'icons/mob/clothing/faction/hardliners/suits.dmi' + blood_overlay_type = "armor" + +/obj/item/clothing/suit/armor/hardliners/jacket + name = "hardliners armored kutte" + desc = "A leather Kutte with a slim Type I armored vest, painted in a classic white associated with the Hardliners. The patch of the Hardliner movement can be seen behind the leather kutte, a nostalgic callback to the leather outfits used by the civilians of Gorlex VII." + icon_state = "hl_jacket" + item_state = "armor" + icon = 'icons/obj/clothing/faction/hardliners/suits.dmi' + mob_overlay_icon = 'icons/mob/clothing/faction/hardliners/suits.dmi' + blood_overlay_type = "armor" + +/obj/item/clothing/suit/armor/hardliners/sergeant + name = "hardliners sergeant jacket" + desc = "An armored jacket typically worn by sergeant of the Hardliners. They're reminiscent of the garb worn by old Gorlex navymen, prior to its destruction." + body_parts_covered = CHEST|GROIN|ARMS + icon_state = "hl_sergeant" + item_state = "hl_sergeant" + blood_overlay_type = "coat" + armor = list("melee" = 35, "bullet" = 30, "laser" = 30, "energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50) + +/obj/item/clothing/suit/toggle/armor/vest/hardliners + name = "hardliners captain coat" + desc = "An imposing armored coat worn by captains of Hardliner fleets, hand-designed by Cybersun tailors to provide maximum protection to its wearer." + body_parts_covered = CHEST|GROIN|ARMS + icon_state = "hl_captain" + item_state = "hl_captain" + icon = 'icons/obj/clothing/faction/hardliners/suits.dmi' + mob_overlay_icon = 'icons/mob/clothing/faction/hardliners/suits.dmi' + blood_overlay_type = "coat" + armor = list("melee" = 35, "bullet" = 30, "laser" = 30, "energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50) + togglename = "buttons" + +/////////////// +//Spacesuits// +////////////// + +/obj/item/clothing/head/helmet/space/hardsuit/syndi/hl + name = "white-red hardsuit helmet" + desc = "An advanced dual-mode helmet derived from ICW-era advanced special operations helmets, its red partly replaced by white. It is in EVA mode. Manufactured by Cybersun Biodynamics." + alt_desc = "An advanced dual-mode helmet derived from ICW-era advanced special operations helmets, its red partly replaced by white. It is in combat mode. Manufactured by Cybersun Biodynamics." + icon_state = "hardsuit1-hl" + item_state = "hardsuit1-hl" + icon = 'icons/obj/clothing/faction/hardliners/head.dmi' + mob_overlay_icon = 'icons/mob/clothing/faction/hardliners/head.dmi' + hardsuit_type = "hl" + +/obj/item/clothing/suit/space/hardsuit/syndi/hl + name = "white-red hardsuit" + desc = "An advanced dual-mode hardsuit derived from ICW-era advanced special operations hardsuits, its red partly replaced by white. It is in EVA mode. Manufactured by Cybersun Biodynamics." + alt_desc = "An advanced dual-mode hardsuit derived from ICW-era advanced special operations hardsuits, its red partly replaced by white. It is in combat mode. Manufactured by Cybersun Biodynamics." + icon_state = "hardsuit1-hl" + item_state = "hardsuit1-hl" + hardsuit_type = "hl" + icon = 'icons/obj/clothing/faction/hardliners/suits.dmi' + mob_overlay_icon = 'icons/mob/clothing/faction/hardliners/suits.dmi' + helmettype = /obj/item/clothing/head/helmet/space/hardsuit/syndi/hl + lightweight = 1 + jetpack = null + +///////// +//Hats// +//////// + +/obj/item/clothing/head/hardliners + name = "white surgical cap" + desc = "A surgical cap used by doctors of Hardliner fleets, matching their white smocks." + icon_state = "hl_surgery" + icon = 'icons/obj/clothing/faction/hardliners/head.dmi' + mob_overlay_icon = 'icons/mob/clothing/faction/hardliners/head.dmi' + + +/obj/item/clothing/head/hardhat/hardliners + name = "white-red hard hat" + desc = "A white-red hardhat typically used by both miners and mechanics under the Hardliner fleets." + icon_state = "hl_hardhat" + icon = 'icons/obj/clothing/faction/hardliners/head.dmi' + mob_overlay_icon = 'icons/mob/clothing/faction/hardliners/head.dmi' + +/obj/item/clothing/head/hardliners/peaked + name = "Hardliner peaked cap" + desc = "A stylish peaked cap utilized by high-ranking officers of the Hardliner movement. Most who wear it are likely to have been a veteran of the ICW, still vying for revenge against Nanotrasen..." + icon_state = "hl_officer" + item_state = "hl_officer" + +/obj/item/clothing/head/helmet/hardliners + name = "hardliners X-11 helmet" + desc = "A well-armored helmet utilized by the Hardliners, though painted in their iconic white. Either it makes them stick out like a sore thumb, or it provides excellent camouflage in snow-covered planets." + icon = 'icons/obj/clothing/faction/hardliners/head.dmi' + mob_overlay_icon = 'icons/mob/clothing/faction/hardliners/head.dmi' + armor = list("melee" = 40, "bullet" = 60, "laser" = 35, "energy" = 35, "bomb" = 40, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50) // The guys who specialize in ballistics would probably have better bullet armor. Maybe. + icon_state = "hl_x11" + item_state = "hl_x11" + +/obj/item/clothing/head/helmet/hardliners/swat + name = "hardliners pilot helmet" + desc = "A modified X-11 helmet utilized by regular pilots, as well as the feared mech pilots of the Hardliner movement. The attached visor helps protect against sudden flashes from explosions." + flash_protect = FLASH_PROTECTION_WELDER + icon_state = "hl_pilot" + item_state = "hl_pilot" + +//////////// +//Glasses// +/////////// + +/obj/item/clothing/glasses/hud/security/sunglasses/hardliners + name = "hardliners security goggles" + desc = "Tinted-red flash-proof goggles used by Hardliners, with an integrated security HUD, courtesy of their partners, Cybersun." + icon_state = "hl_goggles" + item_state = "hl_goggles" + icon = 'icons/obj/clothing/faction/hardliners/eyes.dmi' + mob_overlay_icon = 'icons/mob/clothing/faction/hardliners/eyes.dmi' + glass_colour_type = /datum/client_colour/glass_colour/red + +////////// +//Belts// +///////// + +/obj/item/storage/belt/security/webbing/hardliners + name = "hardliners webbing" + desc = "A set of tactical webbing for operators of the Hardliner movement, can hold security gear." + icon_state = "hl_webbing" + item_state = "hl_webbing" + icon = 'icons/obj/clothing/faction/hardliners/belt.dmi' + mob_overlay_icon = 'icons/mob/clothing/faction/hardliners/belt.dmi' diff --git a/code/modules/clothing/outfits/factions/syndicate.dm b/code/modules/clothing/outfits/factions/syndicate.dm index 8f13554f4b00..5e04d87d88c6 100644 --- a/code/modules/clothing/outfits/factions/syndicate.dm +++ b/code/modules/clothing/outfits/factions/syndicate.dm @@ -54,10 +54,10 @@ box = /obj/item/storage/box/survival/syndie /datum/outfit/job/syndicate/assistant/gorlex - name = "Syndicate - Junior Agent (Gorlex Marauders)" + name = "Syndicate - Junior Agent (Hardliner)" - uniform = /obj/item/clothing/under/syndicate/gorlex - alt_uniform = /obj/item/clothing/under/syndicate + uniform = /obj/item/clothing/under/syndicate/hardliners + alt_uniform = /obj/item/clothing/under/syndicate/hardliners/jumpsuit /datum/outfit/job/syndicate/assistant/ngr name = "Syndicate - Initiate (New Gorlex Republic)" @@ -306,11 +306,12 @@ /datum/outfit/job/syndicate/captain/gorlex - name = "Syndicate - Captain (Gorlex Marauders)" - uniform = /obj/item/clothing/under/syndicate/ngr/officer + name = "Syndicate - Captain (Hardliner)" + uniform = /obj/item/clothing/under/syndicate/hardliners/officer - head = /obj/item/clothing/head/ngr/peaked - suit = /obj/item/clothing/suit/armor/ngr/captain + head = /obj/item/clothing/head/hardliners/peaked + suit = /obj/item/clothing/suit/toggle/armor/vest/hardliners + shoes = /obj/item/clothing/shoes/combat /datum/outfit/job/syndicate/captain/ngr name = "Syndicate - Captain (New Gorlex Republic)" @@ -428,17 +429,6 @@ id = /obj/item/card/id/syndicate_command/captain_id gloves = /obj/item/clothing/gloves/combat -/datum/outfit/job/syndicate/ce/gorlex - name = "Syndicate - Foreman (Gorlex Marauders)" - - ears = /obj/item/radio/headset/syndicate/alt - uniform = /obj/item/clothing/under/syndicate/gorlex - alt_uniform = null - suit = /obj/item/clothing/suit/toggle/hazard - alt_suit = null - shoes = /obj/item/clothing/shoes/jackboots - gloves = /obj/item/clothing/gloves/combat - /datum/outfit/job/syndicate/ce/ngr name = "Syndicate - Foreman (New Gorlex Republic)" @@ -566,24 +556,27 @@ backpack_contents = list(/obj/item/melee/baton/loaded=1) /datum/outfit/job/syndicate/hos/gorlex - name = "Syndicate - Sergeant (Gorlex)" + name = "Syndicate - Sergeant (Hardliner)" id_assignment = "Sergeant" + uniform = /obj/item/clothing/under/syndicate/hardliners/officer + head = /obj/item/clothing/head/hardliners/peaked + suit = /obj/item/clothing/suit/armor/hardliners/sergeant + id = /obj/item/card/id/syndicate_command/crew_id + shoes = /obj/item/clothing/shoes/combat + suit_store = /obj/item/gun/ballistic/automatic/pistol + /datum/outfit/job/syndicate/hos/ngr name = "Syndicate - Lieutenant (New Gorlex Republic)" id_assignment = "Lieutenant" - ears = /obj/item/radio/headset/syndicate/alt uniform = /obj/item/clothing/under/syndicate/ngr/officer head = /obj/item/clothing/head/ngr/peaked - suit =/obj/item/clothing/suit/armor/ngr/lieutenant + suit = /obj/item/clothing/suit/armor/ngr/lieutenant id = /obj/item/card/id/syndicate_command/crew_id shoes = /obj/item/clothing/shoes/combat - glasses = /obj/item/clothing/glasses/hud/security/sunglasses suit_store = /obj/item/gun/ballistic/automatic/pistol - r_pocket = /obj/item/assembly/flash/handheld - l_pocket = /obj/item/restraints/handcuffs - backpack_contents = list(/obj/item/melee/baton/loaded=1) + /datum/outfit/job/syndicate/hos/twink name = "Syndicate - Lieutenant (Twinkleshine, NGR)" @@ -691,13 +684,15 @@ uniform = /obj/item/clothing/under/syndicate/medic accessory = /obj/item/clothing/accessory/armband/medblue - shoes = /obj/item/clothing/shoes/jackboots + shoes = /obj/item/clothing/shoes/combat /datum/outfit/job/syndicate/doctor/gorlex - name = "Syndicate - Medical Doctor (Gorlex)" + name = "Syndicate - Medical Doctor (Hardliner)" - uniform = /obj/item/clothing/under/syndicate/gorlex - glasses = /obj/item/clothing/glasses/hud/health/prescription + uniform = /obj/item/clothing/under/syndicate/hardliners + head = /obj/item/clothing/head/hardliners + suit = /obj/item/clothing/suit/hardliners + glasses = /obj/item/clothing/glasses/hud/health r_pocket = /obj/item/kitchen/knife/combat/survival back = /obj/item/storage/backpack/duffelbag/syndie/med id = /obj/item/card/id/syndicate_command/crew_id @@ -904,7 +899,25 @@ /datum/outfit/job/syndicate/security/gorlex - name = "Syndicate - Assault Operative (Gorlex)" + name = "Syndicate - Trooper (Hardliner)" + id_assignment = "Trooper" + job_icon = "securityofficer" + + uniform = /obj/item/clothing/under/syndicate/hardliners + belt = /obj/item/storage/belt/security/webbing/hardliners + suit = /obj/item/clothing/suit/armor/hardliners + gloves = /obj/item/clothing/gloves/color/black + head = /obj/item/clothing/head/helmet/hardliners + shoes = /obj/item/clothing/shoes/combat + l_pocket = /obj/item/restraints/handcuffs + r_pocket = /obj/item/assembly/flash/handheld + +/datum/outfit/job/syndicate/security/gorlex + name = "Syndicate - Pilot (Hardliner)" + id_assignment = "Pilot" + job_icon = "securityofficer" + + head = /obj/item/clothing/head/helmet/hardliners/swat /datum/outfit/job/syndicate/security/ngr name = "Syndicate - Operative (New Gorlex Republic)" @@ -920,6 +933,14 @@ l_pocket = /obj/item/restraints/handcuffs r_pocket = /obj/item/assembly/flash/handheld +/datum/outfit/job/syndicate/security/ngr/pilot + name = "Syndicate - Pilot (New Gorlex Republic)" + id_assignment = "Pilot" + job_icon = "securityofficer" + + uniform = /obj/item/clothing/under/syndicate/ngr/fatigues + head = /obj/item/clothing/head/helmet/ngr/swat + /datum/outfit/job/syndicate/security/twink name = "Syndicate - Operative (Twinkleshine)" @@ -987,10 +1008,12 @@ /obj/item/stack/marker_beacon/ten=1) /datum/outfit/job/syndicate/miner/gorlex - name = "Syndicate - Wrecker (Gorlex Marauders)" + name = "Syndicate - Wrecker (Hardliner)" id_assignment = "Wrecker" - uniform = /obj/item/clothing/under/syndicate/gorlex + head = /obj/item/clothing/head/hardhat/hardliners + suit = /obj/item/clothing/suit/hazardvest/hardliners + uniform = /obj/item/clothing/under/syndicate/hardliners/jumpsuit accessory = /obj/item/clothing/accessory/armband/cargo shoes = /obj/item/clothing/shoes/workboots ears = /obj/item/radio/headset/alt @@ -1090,10 +1113,12 @@ id = /obj/item/card/id/syndicate_command/crew_id /datum/outfit/job/syndicate/engineer/gorlex - name = "Syndicate - Mechanic (Gorlex Marauders)" + name = "Syndicate - Mechanic (Hardliner)" id_assignment = "Mechanic" - uniform = /obj/item/clothing/under/syndicate/gorlex + head = /obj/item/clothing/head/hardhat/hardliners + suit = /obj/item/clothing/suit/hazardvest/hardliners + uniform = /obj/item/clothing/under/syndicate/hardliners shoes = /obj/item/clothing/shoes/workboots glasses = null diff --git a/icons/mob/clothing/faction/hardliners/belt.dmi b/icons/mob/clothing/faction/hardliners/belt.dmi new file mode 100644 index 000000000000..a864128547d6 Binary files /dev/null and b/icons/mob/clothing/faction/hardliners/belt.dmi differ diff --git a/icons/mob/clothing/faction/hardliners/eyes.dmi b/icons/mob/clothing/faction/hardliners/eyes.dmi new file mode 100644 index 000000000000..aec97963fd99 Binary files /dev/null and b/icons/mob/clothing/faction/hardliners/eyes.dmi differ diff --git a/icons/mob/clothing/faction/hardliners/head.dmi b/icons/mob/clothing/faction/hardliners/head.dmi new file mode 100644 index 000000000000..839826a7c426 Binary files /dev/null and b/icons/mob/clothing/faction/hardliners/head.dmi differ diff --git a/icons/mob/clothing/faction/hardliners/suits.dmi b/icons/mob/clothing/faction/hardliners/suits.dmi new file mode 100644 index 000000000000..05f41eb00d25 Binary files /dev/null and b/icons/mob/clothing/faction/hardliners/suits.dmi differ diff --git a/icons/mob/clothing/faction/hardliners/uniforms.dmi b/icons/mob/clothing/faction/hardliners/uniforms.dmi new file mode 100644 index 000000000000..8726f50b2f54 Binary files /dev/null and b/icons/mob/clothing/faction/hardliners/uniforms.dmi differ diff --git a/icons/mob/clothing/faction/ngr/head.dmi b/icons/mob/clothing/faction/ngr/head.dmi index 08af6ee9ba08..c370f07aa0f3 100644 Binary files a/icons/mob/clothing/faction/ngr/head.dmi and b/icons/mob/clothing/faction/ngr/head.dmi differ diff --git a/icons/mob/clothing/head/spacesuits.dmi b/icons/mob/clothing/head/spacesuits.dmi index 12923a0e281c..55a7f69de51f 100644 Binary files a/icons/mob/clothing/head/spacesuits.dmi and b/icons/mob/clothing/head/spacesuits.dmi differ diff --git a/icons/mob/clothing/suits/spacesuits.dmi b/icons/mob/clothing/suits/spacesuits.dmi index ee9896871a91..da5075195992 100644 Binary files a/icons/mob/clothing/suits/spacesuits.dmi and b/icons/mob/clothing/suits/spacesuits.dmi differ diff --git a/icons/obj/clothing/faction/hardliners/belt.dmi b/icons/obj/clothing/faction/hardliners/belt.dmi new file mode 100644 index 000000000000..e8925f9c5d36 Binary files /dev/null and b/icons/obj/clothing/faction/hardliners/belt.dmi differ diff --git a/icons/obj/clothing/faction/hardliners/eyes.dmi b/icons/obj/clothing/faction/hardliners/eyes.dmi new file mode 100644 index 000000000000..2e339c1b510a Binary files /dev/null and b/icons/obj/clothing/faction/hardliners/eyes.dmi differ diff --git a/icons/obj/clothing/faction/hardliners/head.dmi b/icons/obj/clothing/faction/hardliners/head.dmi new file mode 100644 index 000000000000..5101eeedce9c Binary files /dev/null and b/icons/obj/clothing/faction/hardliners/head.dmi differ diff --git a/icons/obj/clothing/faction/hardliners/suits.dmi b/icons/obj/clothing/faction/hardliners/suits.dmi new file mode 100644 index 000000000000..39da1c952739 Binary files /dev/null and b/icons/obj/clothing/faction/hardliners/suits.dmi differ diff --git a/icons/obj/clothing/faction/hardliners/uniforms.dmi b/icons/obj/clothing/faction/hardliners/uniforms.dmi new file mode 100644 index 000000000000..233eb500c826 Binary files /dev/null and b/icons/obj/clothing/faction/hardliners/uniforms.dmi differ diff --git a/icons/obj/clothing/faction/ngr/head.dmi b/icons/obj/clothing/faction/ngr/head.dmi index 822766336620..d2258c5565dd 100644 Binary files a/icons/obj/clothing/faction/ngr/head.dmi and b/icons/obj/clothing/faction/ngr/head.dmi differ diff --git a/icons/obj/clothing/head/spacesuits.dmi b/icons/obj/clothing/head/spacesuits.dmi index 5c2351c7489f..8befad3b380f 100644 Binary files a/icons/obj/clothing/head/spacesuits.dmi and b/icons/obj/clothing/head/spacesuits.dmi differ diff --git a/icons/obj/clothing/suits/spacesuits.dmi b/icons/obj/clothing/suits/spacesuits.dmi index c86acdcbf3e5..2208c8b7cf98 100644 Binary files a/icons/obj/clothing/suits/spacesuits.dmi and b/icons/obj/clothing/suits/spacesuits.dmi differ diff --git a/shiptest.dme b/shiptest.dme index 2589b6a96c06..4a8d96774621 100644 --- a/shiptest.dme +++ b/shiptest.dme @@ -1967,6 +1967,7 @@ #include "code\modules\clothing\factions\clip.dm" #include "code\modules\clothing\factions\frontiersmen.dm" #include "code\modules\clothing\factions\gezena.dm" +#include "code\modules\clothing\factions\hardliners.dm" #include "code\modules\clothing\factions\nanotrasen.dm" #include "code\modules\clothing\factions\ngr.dm" #include "code\modules\clothing\factions\suns.dm"