diff --git a/_maps/RandomRuins/JungleRuins/jungle_bombed_starport.dmm b/_maps/RandomRuins/JungleRuins/jungle_bombed_starport.dmm index dee3343b8d78..83f661365941 100644 --- a/_maps/RandomRuins/JungleRuins/jungle_bombed_starport.dmm +++ b/_maps/RandomRuins/JungleRuins/jungle_bombed_starport.dmm @@ -5611,7 +5611,7 @@ /area/overmap_encounter/planetoid/jungle/explored) "LM" = ( /obj/structure/closet, -/obj/item/clothing/suit/armor/vest/capcarapace/ngr_captain, +/obj/item/clothing/suit/armor/ngr/captain, /obj/item/clothing/under/syndicate/ngr/officer, /obj/item/gun/ballistic/automatic/pistol, /obj/item/ammo_box/magazine/m10mm, @@ -7296,7 +7296,7 @@ /obj/effect/decal/remains/human, /obj/effect/decal/cleanable/vomit/old, /obj/item/clothing/under/syndicate/ngr/officer, -/obj/item/clothing/suit/armor/vest/capcarapace/ngr_captain, +/obj/item/clothing/suit/armor/ngr/captain, /obj/item/clothing/shoes/combat, /turf/open/floor/mineral/plastitanium, /area/ruin/jungle/starport/tower) diff --git a/_maps/configs/syndicate_gorlex_hyena.json b/_maps/configs/syndicate_gorlex_hyena.json index 7b72cf208e0d..a835e00b1eba 100644 --- a/_maps/configs/syndicate_gorlex_hyena.json +++ b/_maps/configs/syndicate_gorlex_hyena.json @@ -18,25 +18,25 @@ "map_path": "_maps/shuttles/syndicate/syndicate_gorlex_hyena.dmm", "job_slots": { "Captain": { - "outfit": "/datum/outfit/job/syndicate/captain/gorlex", + "outfit": "/datum/outfit/job/syndicate/captain/ngr", "officer": true, "slots": 1 }, "Foreman": { - "outfit": "/datum/outfit/job/syndicate/ce/gorlex/ngr", + "outfit": "/datum/outfit/job/syndicate/ce/ngr", "officer": true, "slots": 1 }, "Mechanic": { - "outfit": "/datum/outfit/job/syndicate/engineer/gorlex", + "outfit": "/datum/outfit/job/syndicate/engineer/ngr", "slots": 1 }, "Wrecker": { - "outfit": "/datum/outfit/job/syndicate/miner/gorlex", + "outfit": "/datum/outfit/job/syndicate/miner/ngr", "slots": 2 }, - "Junior Agent": { - "outfit": "/datum/outfit/job/syndicate/assistant/gorlex/ngr", + "Initiate": { + "outfit": "/datum/outfit/job/syndicate/assistant/ngr", "slots": 2 } }, diff --git a/_maps/shuttles/syndicate/syndicate_gorlex_hyena.dmm b/_maps/shuttles/syndicate/syndicate_gorlex_hyena.dmm index 93600539c4b4..ce77d98f5833 100644 --- a/_maps/shuttles/syndicate/syndicate_gorlex_hyena.dmm +++ b/_maps/shuttles/syndicate/syndicate_gorlex_hyena.dmm @@ -56,11 +56,11 @@ }, /obj/item/storage/backpack/security, /obj/item/clothing/under/syndicate/ngr/officer, -/obj/item/clothing/suit/armor/vest/capcarapace/ngr_captain, -/obj/item/clothing/shoes/jackboots, +/obj/item/clothing/suit/armor/ngr/captain, +/obj/item/clothing/shoes/combat, /obj/item/clothing/gloves/combat, /obj/item/clothing/glasses/hud/security/sunglasses/eyepatch, -/obj/item/clothing/head/ngrcap, +/obj/item/clothing/head/ngr/peaked, /obj/effect/decal/cleanable/dirt/dust, /obj/item/gun/ballistic/revolver, /obj/item/ammo_box/a357/match, @@ -75,10 +75,6 @@ icon_state = "syndicate"; name = "armor locker" }, -/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/effect/decal/cleanable/dirt/dust, /obj/item/radio/intercom/directional/west{ pixel_y = -5 @@ -91,6 +87,12 @@ /obj/machinery/light/small/directional/west{ pixel_y = 7 }, +/obj/item/clothing/glasses/hud/security/sunglasses/ngr, +/obj/item/clothing/glasses/hud/security/sunglasses/ngr, +/obj/item/clothing/suit/armor/ngr, +/obj/item/clothing/suit/armor/ngr, +/obj/item/clothing/head/helmet/ngr, +/obj/item/clothing/head/helmet/ngr, /turf/open/floor/mineral/plastitanium, /area/ship/security/armory) "bN" = ( @@ -882,14 +884,10 @@ "pt" = ( /obj/effect/turf_decal/industrial/outline, /obj/item/clothing/shoes/workboots/mining, -/obj/item/clothing/under/syndicate/gorlex, -/obj/item/clothing/gloves/explorer, /obj/item/clothing/accessory/armband/cargo, /obj/item/storage/belt/mining, /obj/item/clothing/glasses/meson, /obj/item/clothing/glasses/welding, -/obj/item/clothing/head/hardhat/orange, -/obj/item/clothing/head/soft/grey, /obj/machinery/light/small/directional/north, /obj/structure/closet/secure_closet{ anchored = 1; @@ -899,15 +897,9 @@ }, /obj/machinery/firealarm/directional/east, /obj/effect/turf_decal/industrial/outline, -/obj/item/clothing/shoes/workboots/mining, -/obj/item/clothing/under/syndicate/gorlex, -/obj/item/clothing/gloves/explorer, -/obj/item/clothing/accessory/armband/cargo, -/obj/item/storage/belt/mining, -/obj/item/clothing/glasses/meson, -/obj/item/clothing/glasses/welding, -/obj/item/clothing/head/hardhat/orange, -/obj/item/clothing/head/soft/grey, +/obj/item/clothing/under/syndicate/ngr/jumpsuit, +/obj/item/clothing/suit/hazardvest/ngr, +/obj/item/clothing/head/hardhat/ngr, /turf/open/floor/plasteel/tech/grid, /area/ship/storage) "pu" = ( @@ -1028,14 +1020,10 @@ req_access = list(11) }, /obj/item/clothing/shoes/workboots, -/obj/item/clothing/under/syndicate/gorlex, /obj/item/clothing/accessory/armband/engine, -/obj/item/clothing/suit/hazardvest, /obj/item/storage/belt/utility, /obj/item/clothing/glasses/meson, /obj/item/clothing/glasses/welding, -/obj/item/clothing/head/hardhat, -/obj/item/clothing/head/soft/yellow, /obj/structure/cable, /obj/machinery/power/apc/auto_name/directional/south, /obj/machinery/light_switch{ @@ -1043,6 +1031,9 @@ pixel_y = -16; pixel_x = -12 }, +/obj/item/clothing/under/syndicate/ngr, +/obj/item/clothing/suit/hazardvest/ngr, +/obj/item/clothing/head/hardhat/ngr, /turf/open/floor/plasteel/tech/grid, /area/ship/storage) "rM" = ( @@ -1154,15 +1145,14 @@ req_access = list(48) }, /obj/item/clothing/shoes/workboots/mining, -/obj/item/clothing/under/syndicate/gorlex, -/obj/item/clothing/gloves/explorer, /obj/item/clothing/accessory/armband/cargo, /obj/item/storage/belt/mining, /obj/item/clothing/glasses/meson, /obj/item/clothing/glasses/welding, -/obj/item/clothing/head/hardhat/orange, -/obj/item/clothing/head/soft/grey, /obj/machinery/airalarm/directional/north, +/obj/item/clothing/under/syndicate/ngr/jumpsuit, +/obj/item/clothing/suit/hazardvest/ngr, +/obj/item/clothing/head/hardhat/ngr, /turf/open/floor/plasteel/tech/grid, /area/ship/storage) "tI" = ( @@ -1340,6 +1330,18 @@ /area/ship/crew) "wP" = ( /obj/effect/turf_decal/industrial/outline, +/obj/structure/closet/crate{ + name = "desert equipment crate"; + desc = "A rectangular steel crate containing supplies to survive a desert environment more easily." + }, +/obj/item/clothing/neck/shemagh/ngr, +/obj/item/clothing/neck/shemagh/ngr, +/obj/item/clothing/neck/shemagh/ngr, +/obj/item/clothing/neck/shemagh/ngr, +/obj/item/clothing/head/ngr/flap, +/obj/item/clothing/head/ngr/flap, +/obj/item/clothing/head/ngr/flap, +/obj/item/clothing/head/ngr/flap, /turf/open/floor/plasteel/mono/dark, /area/ship/cargo) "xm" = ( @@ -1489,25 +1491,32 @@ /obj/structure/closet/wall/red/directional/east{ name = "uniform closet" }, -/obj/item/clothing/under/syndicate/gorlex, -/obj/item/clothing/under/syndicate/gorlex, -/obj/item/clothing/under/syndicate/gorlex, -/obj/item/clothing/under/syndicate/gorlex, -/obj/item/clothing/shoes/jackboots, -/obj/item/clothing/shoes/jackboots, -/obj/item/clothing/shoes/jackboots, -/obj/item/clothing/shoes/jackboots, +/obj/item/tank/jetpack/suit, +/obj/item/clothing/shoes/combat, +/obj/item/clothing/shoes/combat, +/obj/item/clothing/shoes/combat, +/obj/item/clothing/shoes/combat, /obj/item/clothing/under/syndicate/ngr, /obj/item/clothing/under/syndicate/ngr, /obj/item/clothing/under/syndicate/ngr, /obj/item/clothing/under/syndicate/ngr, -/obj/item/clothing/head/soft/black, -/obj/item/clothing/head/soft/black, -/obj/item/clothing/head/soft/black, -/obj/item/clothing/head/soft/black, /obj/structure/cable{ icon_state = "1-8" }, +/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ + dir = 9 + }, +/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ + dir = 9 + }, +/obj/item/clothing/under/syndicate/ngr/jumpsuit, +/obj/item/clothing/under/syndicate/ngr/jumpsuit, +/obj/item/clothing/under/syndicate/ngr/jumpsuit, +/obj/item/clothing/under/syndicate/ngr/jumpsuit, +/obj/item/clothing/head/ngr, +/obj/item/clothing/head/ngr, +/obj/item/clothing/head/ngr, +/obj/item/clothing/head/ngr, /obj/item/radio, /obj/item/radio, /obj/item/radio, @@ -1515,12 +1524,6 @@ /obj/item/radio, /obj/item/radio, /obj/item/radio, -/obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ - dir = 9 - }, -/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ - dir = 9 - }, /turf/open/floor/plasteel/dark, /area/ship/crew/dorm) "zA" = ( @@ -1642,19 +1645,14 @@ name = "foreman's locker"; req_access = list(56) }, -/obj/item/clothing/shoes/jackboots, +/obj/item/clothing/shoes/combat, /obj/item/clothing/under/syndicate/ngr/officer, -/obj/item/clothing/suit/toggle/industrial, /obj/item/clothing/gloves/combat, /obj/item/storage/belt/utility/chief{ name = "\improper Foreman's toolbelt" }, /obj/item/clothing/glasses/meson, /obj/item/clothing/glasses/welding, -/obj/item/clothing/head/hardhat/white, -/obj/item/clothing/head/beret/ce{ - name = "foreman beret" - }, /obj/item/storage/toolbox/syndicate, /obj/item/wrench/combat, /obj/item/ammo_box/magazine/m10mm, @@ -1662,6 +1660,8 @@ /obj/item/clothing/accessory/holster, /obj/item/grenade/chem_grenade/metalfoam, /obj/machinery/airalarm/directional/west, +/obj/item/clothing/suit/ngr, +/obj/item/clothing/head/hardhat/ngr/foreman, /obj/item/tank/jetpack/suit, /turf/open/floor/carpet/red, /area/ship/cargo/office) @@ -1692,7 +1692,7 @@ dir = 4; pixel_x = -20 }, -/obj/item/clothing/suit/space/hardsuit/syndi/sbg, +/obj/item/clothing/suit/space/hardsuit/syndi/ngr, /obj/item/clothing/mask/gas/syndicate, /turf/open/floor/carpet/black, /area/ship/bridge) diff --git a/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm b/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm index 5878f667db1e..73a44c1cb972 100644 --- a/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm +++ b/_maps/shuttles/syndicate/syndicate_twinkleshine.dmm @@ -101,8 +101,8 @@ req_access = list(3,150) }, /obj/item/clothing/under/syndicate/ngr/officer, -/obj/item/clothing/suit/armor/vest/capcarapace/ngr_captain, -/obj/item/clothing/head/ngrcap, +/obj/item/clothing/suit/armor/ngr/captain, +/obj/item/clothing/head/ngr/peaked, /obj/item/clothing/shoes/combat, /obj/item/megaphone/sec{ name = "syndicate megaphone" @@ -2367,7 +2367,7 @@ dir = 8 }, /obj/machinery/suit_storage_unit/syndicate{ - suit_type = /obj/item/clothing/suit/space/hardsuit/syndi/sbg; + suit_type = /obj/item/clothing/suit/space/hardsuit/syndi/ngr; name = "lieutenant's suit storage unit" }, /turf/open/floor/mineral/plastitanium, diff --git a/code/game/objects/structures/lavaland/geyser.dm b/code/game/objects/structures/lavaland/geyser.dm index ed177c72d34e..224a11206d9f 100644 --- a/code/game/objects/structures/lavaland/geyser.dm +++ b/code/game/objects/structures/lavaland/geyser.dm @@ -51,6 +51,8 @@ name = "plunger" desc = "It's a plunger for plunging." icon = 'icons/obj/watercloset.dmi' + righthand_file = 'icons/mob/inhands/equipment/tools_righthand.dmi' + lefthand_file = 'icons/mob/inhands/equipment/tools_lefthand.dmi' icon_state = "plunger" slot_flags = ITEM_SLOT_MASK diff --git a/code/modules/clothing/factions/ngr.dm b/code/modules/clothing/factions/ngr.dm new file mode 100644 index 000000000000..7892a098b50d --- /dev/null +++ b/code/modules/clothing/factions/ngr.dm @@ -0,0 +1,244 @@ +////////////// +//Jumpsuits// +///////////// + +/obj/item/clothing/under/syndicate/ngr + name = "\improper NGR uniform" + desc = "A button-up in a tasteful beige with black pants, used as the basic uniform of the New Gorlex Republic." + icon_state = "ngr" + item_state = "ngr" + 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/ngr/uniforms.dmi' + mob_overlay_icon = 'icons/mob/clothing/faction/ngr/uniforms.dmi' + +/obj/item/clothing/under/syndicate/ngr/fatigues + name = "\improper NGR fatigues" + desc = "Beige fatigues used primarily by the ship and mech pilots of the New Gorlex Republic." + icon_state = "ngr_fatigues" + item_state = "ngr_fatigues" + +/obj/item/clothing/under/syndicate/ngr/jumpsuit + name = "\improper NGR jumpsuit" + desc = "A beige jumpsuit with black overalls used by wreckers of the New Gorlex Republic. A reminder of Gorlex VII's history as a mining colony, prior to its destruction." + icon_state = "ngr_jumpsuit" + item_state = "ngr_jumpsuit" + +/obj/item/clothing/under/syndicate/ngr/officer + name = "\improper NGR officer uniform" + desc = "A button-up in a tasteful black with beige pants, used by officers of the New Gorlex Republic." + icon_state = "ngr_officer" + item_state = "ngr_officer" + +/obj/item/clothing/under/plasmaman/ngr + name = "\improper NGR phorid envirosuit" + desc = "A button-up envirosuit with use intended for phorids of the New Gorlex Republic. Ensures they don't die of combustion." + icon_state = "ngr_envirosuit" + item_state = "ngr_envirosuit" + icon = 'icons/obj/clothing/faction/ngr/uniforms.dmi' + mob_overlay_icon = 'icons/mob/clothing/faction/ngr/uniforms.dmi' + + +//////////////////// +//Unarmored suits// +/////////////////// + +/obj/item/clothing/suit/ngr + name = "foreman's jacket" + desc = "A beige high-visibility jacket worn by the Foreman of the New Gorlex Republic." + icon = 'icons/obj/clothing/faction/ngr/suits.dmi' + mob_overlay_icon = 'icons/mob/clothing/faction/ngr/suits.dmi' + icon_state = "ngr_foreman" + item_state = "blackcloth" + +/obj/item/clothing/suit/ngr/smock + name = "blood red smock" + desc = "A blood-red surgical smock typically worn by field medics of the New Gorlex Republic. It hides red blood really well!" + icon_state = "ngr_apron" + item_state = "redcloth" + +/obj/item/clothing/suit/hazardvest/ngr + name = "blood-red hazard vest" + desc = "A blood-red high-visibility vest typically used in work zones by the New Gorlex Republic." + icon = 'icons/obj/clothing/faction/ngr/suits.dmi' + mob_overlay_icon = 'icons/mob/clothing/faction/ngr/suits.dmi' + icon_state = "ngr_hazard" + item_state = "redcloth" + +////////////////// +//Armored suits// +///////////////// + +/obj/item/clothing/suit/armor/ngr + name = "NGR armor vest" + desc = "A slim Type I armored vest, utilized by the 2nd Battlegroup of the New Gorlex Republic that provides decent protection against most types of damage." + icon_state = "ngr_vest" + item_state = "armor" + icon = 'icons/obj/clothing/faction/ngr/suits.dmi' + mob_overlay_icon = 'icons/mob/clothing/faction/ngr/suits.dmi' + blood_overlay_type = "armor" + +/obj/item/clothing/suit/armor/ngr/lieutenant + name = "\improper 2nd Battlegroup overcoat" + desc = "An armored overcoat worn by the lieutenants of the New Gorlex Republic's 2nd Battlegroup." + body_parts_covered = CHEST|GROIN|ARMS + icon_state = "ngr_lieutenant" + item_state = "ngr_lieutenant" + 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/armor/ngr/captain + name = "\improper 2nd Battlegroup coat" + desc = "An armored coat worn by captains the New Gorlex Republic's 2nd Battlegroup." + body_parts_covered = CHEST|GROIN|ARMS + icon_state = "ngr_captain" + item_state = "ngr_captain" + blood_overlay_type = "coat" + armor = list("melee" = 35, "bullet" = 30, "laser" = 30, "energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50) + +/////////////// +//Spacesuits// +////////////// + +/obj/item/clothing/head/helmet/space/hardsuit/syndi/ngr + name = "beige-red hardsuit helmet" + desc = "A standardized dual-mode helmet derived from ICW-era advanced special operations helmets, its red partly replaced by beige. It is in EVA mode. Manufactured by Second Battlegroup." + alt_desc = "A standardized dual-mode helmet derived from ICW-era advanced special operations helmets, its red partly replaced by beige. It is in combat mode. Manufactured by Second Battlegroup." + icon_state = "hardsuit1-ngr" + item_state = "hardsuit1-ngr" + icon = 'icons/obj/clothing/faction/ngr/head.dmi' + mob_overlay_icon = 'icons/mob/clothing/faction/ngr/head.dmi' + hardsuit_type = "ngr" + +/obj/item/clothing/suit/space/hardsuit/syndi/ngr + name = "beige-red hardsuit" + desc = "A standardized dual-mode hardsuit derived from ICW-era advanced special operations hardsuits, its red partly replaced by beige. It is in EVA mode. Manufactured by Second Battlegroup." + alt_desc = "A standardized dual-mode hardsuit derived from ICW-era advanced special operations hardsuits, its red partly replaced by beige. It is in combat mode. Manufactured by the Second Battlegroup." + icon_state = "hardsuit1-ngr" + item_state = "hardsuit1-ngr" + hardsuit_type = "ngr" + icon = 'icons/obj/clothing/faction/ngr/suits.dmi' + mob_overlay_icon = 'icons/mob/clothing/faction/ngr/suits.dmi' + helmettype = /obj/item/clothing/head/helmet/space/hardsuit/syndi/ngr + lightweight = 1 + jetpack = null + +/obj/item/clothing/head/helmet/space/plasmaman/ngr + name = "NGR phorid envirosuit helmet" + desc = "An envirohelmet designed for phorids of the New Gorlex Republic, with intimidating blood-red stripes." + icon_state = "ngr_envirohelm" + item_state = "ngr_envirohelm" + icon = 'icons/obj/clothing/faction/ngr/head.dmi' + mob_overlay_icon = 'icons/mob/clothing/faction/ngr/head.dmi' + +///////// +//Hats// +//////// + +/obj/item/clothing/head/ngr + name = "beige garrison cap" + desc = "A garrison cap used by low-ranking members of the New Gorlex Republic's 2nd Battlegroup when off-duty." + icon_state = "ngr_garrison" + icon = 'icons/obj/clothing/faction/ngr/head.dmi' + mob_overlay_icon = 'icons/mob/clothing/faction/ngr/head.dmi' + armor = list("melee" = 10, "bullet" = 10, "laser" = 10, "energy" = 10, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 50) + +/obj/item/clothing/head/ngr/flap + name = "beige flap cap" + desc = "A flap cap used by soldiers of the New Gorlex Republic's 2nd Battlegroup in desert environments." + icon_state = "ngr_flap" + +/obj/item/clothing/head/ngr/surgical + name = "blood-red surgical cap" + desc = "A surgical cap used by field medics of the New Gorlex Republic's 2nd Battlegroup." + icon_state = "ngr_surgery" + +/obj/item/clothing/head/hardhat/ngr + name = "blood-red hard hat" + desc = "A blood-red hardhat typically used by Wreckers and Ship Engineers of the New Gorlex Republic." + icon_state = "ngr_hardhat" + icon = 'icons/obj/clothing/faction/ngr/head.dmi' + mob_overlay_icon = 'icons/mob/clothing/faction/ngr/head.dmi' + +/obj/item/clothing/head/hardhat/ngr/foreman + name = "beige hard hat" + desc = "A beige hardhat used exclusively by the Foreman of the New Gorlex Republic." + icon_state = "ngr_foreman" + +/obj/item/clothing/head/ngr/peaked + name = "2nd Battlegroup peaked cap" + desc = "A cap worn by officers of the New Gorlex Republic's 2nd Battlegroup." + icon_state = "ngr_officer" + item_state = "ngr_officer" + +/obj/item/clothing/head/helmet/ngr + name = "\improper NGR X-11 helmet" + desc = "A well-armored helmet utilized by the New Gorlex Republic's 2nd Battlegroup, far better at protecting one's head than the softer caps." + icon = 'icons/obj/clothing/faction/ngr/head.dmi' + mob_overlay_icon = 'icons/mob/clothing/faction/ngr/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 = "ngr_x11" + item_state = "ngr_x11" + +/obj/item/clothing/head/helmet/ngr/swat + name = "\improper NGR pilot helmet" + desc = "A modified X-11 helmet utilized by the pilots of the New Gorlex Republic's 2nd Battlegroup. The attached visor helps protect against sudden flashes from explosions." + flash_protect = FLASH_PROTECTION_WELDER + icon_state = "ngr_pilot" + item_state = "ngr_pilot" + +//////////// +//Glasses// +/////////// + +/obj/item/clothing/glasses/hud/security/sunglasses/ngr + name = "NGR modified mesons" + desc = "A modified version of widely-used optical meson scanners, with a flash-proof tint and integrated security HUD. Unfortunately, the opaque visor disables the meson functionality." + icon_state = "ngr_goggles" + item_state = "ngr_goggles" + icon = 'icons/obj/clothing/faction/ngr/eyes.dmi' + mob_overlay_icon = 'icons/mob/clothing/faction/ngr/eyes.dmi' + glass_colour_type = /datum/client_colour/glass_colour/green + +////////// +//Masks// +///////// + +/obj/item/clothing/mask/gas/sechailer/balaclava/ngr + name = "NGR combat balaclava" + desc = "A surprisingly advanced balaclava. while it doesn't muffle your voice it has a miniature rebreather for internals. Comfy to boot! This version is commonly used by the soldiers of the New Gorlex Republic to protect against sandstorms." + icon_state = "ngr_balaclava" + item_state = "ngr_balaclava" + icon = 'icons/obj/clothing/faction/ngr/mask.dmi' + mob_overlay_icon = 'icons/mob/clothing/faction/ngr/mask.dmi' + +/obj/item/clothing/mask/gas/syndicate/ngr + name = "NGR face mask" + desc = "A face mask that covers the nose, mouth and neck of those who wear it. Favored by field medics over the balaclava due to lessened heat while wearing." + icon_state = "ngr_facemask" + item_state = "ngr_facemask" + icon = 'icons/obj/clothing/faction/ngr/mask.dmi' + mob_overlay_icon = 'icons/mob/clothing/faction/ngr/mask.dmi' + +////////// +//Neck// +///////// + +/obj/item/clothing/neck/shemagh/ngr + name = "shemagh" + desc = "An oversized shemagh, in a tacticool blood-red for use in the 2nd Battlegroup." + icon_state = "ngr_shemagh" + icon = 'icons/obj/clothing/faction/ngr/neck.dmi' + mob_overlay_icon = 'icons/mob/clothing/faction/ngr/neck.dmi' + +////////// +//Belts// +///////// + +/obj/item/storage/belt/security/webbing/ngr + name = "NGR webbing" + desc = "A set of tactical webbing for operators of the New Gorlex Republic, can hold security gear." + icon_state = "ngr_webbing" + item_state = "ngr_webbing" + icon = 'icons/obj/clothing/faction/ngr/belt.dmi' + mob_overlay_icon = 'icons/mob/clothing/faction/ngr/belt.dmi' diff --git a/code/modules/clothing/head/misc.dm b/code/modules/clothing/head/misc.dm index 3fcd65635718..7ede2b87abd0 100644 --- a/code/modules/clothing/head/misc.dm +++ b/code/modules/clothing/head/misc.dm @@ -446,13 +446,6 @@ icon_state = "JackFrostHat" item_state = "JackFrostHat" -/obj/item/clothing/head/ngrcap - name = "2nd Battlegroup peaked cap" - desc = "A cap worn by officers of the New Gorlex Republic's 2nd Battlegroup." - icon_state = "ngrcap" - item_state = "ngrcap" - flags_inv = 0 - /obj/item/clothing/head/maidheadband/syndicate name = "tactical maid headband" desc = "Tacticute." diff --git a/code/modules/clothing/outfits/factions/syndicate.dm b/code/modules/clothing/outfits/factions/syndicate.dm index 8f98f29a6b1f..8f13554f4b00 100644 --- a/code/modules/clothing/outfits/factions/syndicate.dm +++ b/code/modules/clothing/outfits/factions/syndicate.dm @@ -59,10 +59,14 @@ uniform = /obj/item/clothing/under/syndicate/gorlex alt_uniform = /obj/item/clothing/under/syndicate -/datum/outfit/job/syndicate/assistant/gorlex/ngr - name = "Syndicate - Junior Agent (New Gorlex Republic)" +/datum/outfit/job/syndicate/assistant/ngr + name = "Syndicate - Initiate (New Gorlex Republic)" + id_assignment = "Initiate" + head = /obj/item/clothing/head/ngr uniform = /obj/item/clothing/under/syndicate/ngr + shoes = /obj/item/clothing/shoes/combat + alt_uniform = null /datum/outfit/job/syndicate/assistant/gec @@ -305,8 +309,16 @@ name = "Syndicate - Captain (Gorlex Marauders)" uniform = /obj/item/clothing/under/syndicate/ngr/officer - head = /obj/item/clothing/head/ngrcap - suit = /obj/item/clothing/suit/armor/vest/capcarapace/ngr_captain + head = /obj/item/clothing/head/ngr/peaked + suit = /obj/item/clothing/suit/armor/ngr/captain + +/datum/outfit/job/syndicate/captain/ngr + name = "Syndicate - Captain (New Gorlex Republic)" + + uniform = /obj/item/clothing/under/syndicate/ngr/officer + head = /obj/item/clothing/head/ngr/peaked + suit = /obj/item/clothing/suit/armor/ngr/captain + shoes = /obj/item/clothing/shoes/combat /datum/outfit/job/syndicate/captain/cybersun name = "Syndicate - Captain (Cybersun)" @@ -427,10 +439,18 @@ shoes = /obj/item/clothing/shoes/jackboots gloves = /obj/item/clothing/gloves/combat -/datum/outfit/job/syndicate/ce/gorlex/ngr +/datum/outfit/job/syndicate/ce/ngr name = "Syndicate - Foreman (New Gorlex Republic)" + head = /obj/item/clothing/head/hardhat/ngr/foreman + ears = /obj/item/radio/headset/syndicate/alt uniform = /obj/item/clothing/under/syndicate/ngr/officer + alt_uniform = null + suit = /obj/item/clothing/suit/ngr + alt_suit = null + shoes = /obj/item/clothing/shoes/combat + gloves = /obj/item/clothing/gloves/combat + //Chief Medical Officer @@ -549,6 +569,22 @@ name = "Syndicate - Sergeant (Gorlex)" id_assignment = "Sergeant" +/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 + 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)" id_assignment = "Lieutenant" @@ -667,6 +703,18 @@ id = /obj/item/card/id/syndicate_command/crew_id backpack_contents = list(/obj/item/storage/box/survival/syndie=1, /obj/item/storage/firstaid/medical,) +/datum/outfit/job/syndicate/doctor/ngr + name = "Syndicate - Medical Doctor (New Gorlex Republic)" + + uniform = /obj/item/clothing/under/syndicate/ngr + head = /obj/item/clothing/head/ngr/surgical + suit = /obj/item/clothing/suit/ngr/smock + 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 + backpack_contents = list(/obj/item/storage/box/survival/syndie=1, /obj/item/storage/firstaid/medical,) + //paramedics @@ -858,6 +906,20 @@ /datum/outfit/job/syndicate/security/gorlex name = "Syndicate - Assault Operative (Gorlex)" +/datum/outfit/job/syndicate/security/ngr + name = "Syndicate - Operative (New Gorlex Republic)" + id_assignment = "Operative" + job_icon = "securityofficer" + + uniform = /obj/item/clothing/under/syndicate/ngr + belt = /obj/item/storage/belt/security/webbing/ngr + suit = /obj/item/clothing/suit/armor/ngr + gloves = /obj/item/clothing/gloves/color/black + head = /obj/item/clothing/head/helmet/ngr + shoes = /obj/item/clothing/shoes/combat + l_pocket = /obj/item/restraints/handcuffs + r_pocket = /obj/item/assembly/flash/handheld + /datum/outfit/job/syndicate/security/twink name = "Syndicate - Operative (Twinkleshine)" @@ -933,6 +995,17 @@ shoes = /obj/item/clothing/shoes/workboots ears = /obj/item/radio/headset/alt +/datum/outfit/job/syndicate/miner/ngr + name = "Syndicate - Wrecker (New Gorlex Republic)" + id_assignment = "Wrecker" + + head = /obj/item/clothing/head/hardhat/ngr + suit = /obj/item/clothing/suit/hazardvest/ngr + uniform = /obj/item/clothing/under/syndicate/ngr/jumpsuit + accessory = /obj/item/clothing/accessory/armband/cargo + shoes = /obj/item/clothing/shoes/workboots + ears = /obj/item/radio/headset/alt + /datum/outfit/job/syndicate/miner/twink name = "Syndicate - Miner (Twinkleshine, SUNS)" @@ -1024,6 +1097,16 @@ shoes = /obj/item/clothing/shoes/workboots glasses = null +/datum/outfit/job/syndicate/engineer/ngr + name = "Syndicate - Mechanic (New Gorlex Republic)" + id_assignment = "Mechanic" + + head = /obj/item/clothing/head/hardhat/ngr + suit = /obj/item/clothing/suit/hazardvest/ngr + uniform = /obj/item/clothing/under/syndicate/ngr + shoes = /obj/item/clothing/shoes/workboots + glasses = null + /datum/outfit/job/syndicate/engineer/twink name = "Syndicate - Ship Engineer (Twinkleshine, GEC)" diff --git a/code/modules/clothing/outfits/plasmaman.dm b/code/modules/clothing/outfits/plasmaman.dm index ba38a4a9240b..05b8c0e1a42c 100644 --- a/code/modules/clothing/outfits/plasmaman.dm +++ b/code/modules/clothing/outfits/plasmaman.dm @@ -217,3 +217,9 @@ head = /obj/item/clothing/head/helmet/space/plasmaman/solgov uniform = /obj/item/clothing/under/plasmaman/solgov gloves = /obj/item/clothing/gloves/color/plasmaman/white + +/datum/outfit/plasmaman/ngr + name = "Plasmangr" + head = /obj/item/clothing/head/helmet/space/plasmaman/ngr + uniform= /obj/item/clothing/under/plasmaman/ngr + gloves = /obj/item/clothing/gloves/color/plasmaman/black diff --git a/code/modules/clothing/spacesuits/hardsuit.dm b/code/modules/clothing/spacesuits/hardsuit.dm index 1ea5af9f1ea4..c07841cdba5a 100644 --- a/code/modules/clothing/spacesuits/hardsuit.dm +++ b/code/modules/clothing/spacesuits/hardsuit.dm @@ -444,26 +444,6 @@ combat_slowdown = 0.5 jetpack = null -//2nd Battlegroup Syndie suit -/obj/item/clothing/head/helmet/space/hardsuit/syndi/sbg - name = "beige-red hardsuit helmet" - desc = "A standardized dual-mode helmet derived from ICW-era advanced special operations helmets, its red partly replaced by beige. It is in EVA mode. Manufactured by Second Battlegroup." - alt_desc = "A standardized dual-mode helmet derived from ICW-era advanced special operations helmets, its red partly replaced by beige. It is in combat mode. Manufactured by Second Battlegroup." - icon_state = "hardsuit1-sbg" - item_state = "hardsuit1-sbg" - hardsuit_type = "sbg" - -/obj/item/clothing/suit/space/hardsuit/syndi/sbg - name = "beige-red hardsuit" - desc = "A standardized dual-mode hardsuit derived from ICW-era advanced special operations hardsuits, its red partly replaced by beige. It is in EVA mode. Manufactured by Second Battlegroup." - alt_desc = "A standardized dual-mode hardsuit derived from ICW-era advanced special operations hardsuits, its red partly replaced by beige. It is in combat mode. Manufactured by the Second Battlegroup." - icon_state = "hardsuit1-sbg" - item_state = "hardsuit1-sbg" - hardsuit_type = "sbg" - helmettype = /obj/item/clothing/head/helmet/space/hardsuit/syndi/sbg - lightweight = 1 - jetpack = null - //Hardliner Syndie suit /obj/item/clothing/head/helmet/space/hardsuit/syndi/hl name = "white-red hardsuit helmet" diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index 4c67c98fd689..8ae55a847280 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -157,15 +157,6 @@ desc = "An extraordinarily fashionable haori, utilized by Cybersun captains. Weaved with armored fabric to protect the user from gunshots." icon_state = "carapace_cybersun" -/obj/item/clothing/suit/armor/vest/capcarapace/ngr_captain - name = "\improper 2nd Battlegroup jacket" - desc = "An armored jacket worn by the New Gorlex Republic's 2nd Battlegroup." - body_parts_covered = CHEST|GROIN|ARMS|HANDS - icon_state = "carapace_ngr" - item_state = "carapace_ngr" - 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/armor/vest/capcarapace/captunic name = "captain's parade coat" desc = "Worn by a captain to show their class." diff --git a/code/modules/clothing/under/syndicate.dm b/code/modules/clothing/under/syndicate.dm index 36cc7c96220e..9eb76ee6bf5e 100644 --- a/code/modules/clothing/under/syndicate.dm +++ b/code/modules/clothing/under/syndicate.dm @@ -93,22 +93,6 @@ armor = list("melee" = 10, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 40) alt_covers_chest = TRUE -/obj/item/clothing/under/syndicate/ngr/officer - name = "NGR officer uniform" - desc = "A black uniform worn by officers of the New Gorlex Republic." - icon_state = "ngr_officer" - can_adjust = FALSE - armor = list("melee" = 10, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 40) - alt_covers_chest = TRUE - -/obj/item/clothing/under/syndicate/ngr - name = "NGR uniform" - desc = "A button-up in a tasteful shade of gray with red pants, used as the basic uniform of the New Gorlex Republic." - icon_state = "ngr_grunt" - can_adjust = FALSE - armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 50, "acid" = 40) - alt_covers_chest = TRUE - /obj/item/clothing/under/syndicate/gorlex name = "Gorlex Marauder uniform" desc = "Originally worn by the miners of the Gorlex VII colony, it is now donned by veteran Gorlex Marauders." diff --git a/html/changelogs/AutoChangeLog-pr-2975.yml b/html/changelogs/AutoChangeLog-pr-2975.yml new file mode 100644 index 000000000000..b215da0620a3 --- /dev/null +++ b/html/changelogs/AutoChangeLog-pr-2975.yml @@ -0,0 +1,4 @@ +author: FleetingExpertise +changes: + - {rscadd: 'Added new sprites for the plunger, rolling pin and push broom by FleetingExpertise'} +delete-after: true diff --git a/icons/mob/clothing/faction/ngr/belt.dmi b/icons/mob/clothing/faction/ngr/belt.dmi new file mode 100644 index 000000000000..5ec3ffa92932 Binary files /dev/null and b/icons/mob/clothing/faction/ngr/belt.dmi differ diff --git a/icons/mob/clothing/faction/ngr/eyes.dmi b/icons/mob/clothing/faction/ngr/eyes.dmi new file mode 100644 index 000000000000..197e2d68c9cd Binary files /dev/null and b/icons/mob/clothing/faction/ngr/eyes.dmi differ diff --git a/icons/mob/clothing/faction/ngr/head.dmi b/icons/mob/clothing/faction/ngr/head.dmi new file mode 100644 index 000000000000..08af6ee9ba08 Binary files /dev/null and b/icons/mob/clothing/faction/ngr/head.dmi differ diff --git a/icons/mob/clothing/faction/ngr/mask.dmi b/icons/mob/clothing/faction/ngr/mask.dmi new file mode 100644 index 000000000000..0baead0a39b1 Binary files /dev/null and b/icons/mob/clothing/faction/ngr/mask.dmi differ diff --git a/icons/mob/clothing/faction/ngr/neck.dmi b/icons/mob/clothing/faction/ngr/neck.dmi new file mode 100644 index 000000000000..9f8d3855b059 Binary files /dev/null and b/icons/mob/clothing/faction/ngr/neck.dmi differ diff --git a/icons/mob/clothing/faction/ngr/suits.dmi b/icons/mob/clothing/faction/ngr/suits.dmi new file mode 100644 index 000000000000..ac4fceb11cae Binary files /dev/null and b/icons/mob/clothing/faction/ngr/suits.dmi differ diff --git a/icons/mob/clothing/faction/ngr/uniforms.dmi b/icons/mob/clothing/faction/ngr/uniforms.dmi new file mode 100644 index 000000000000..9eccbe4bfe54 Binary files /dev/null and b/icons/mob/clothing/faction/ngr/uniforms.dmi differ diff --git a/icons/mob/clothing/mask.dmi b/icons/mob/clothing/mask.dmi index d705fb48c01f..2b54aa38a584 100644 Binary files a/icons/mob/clothing/mask.dmi and b/icons/mob/clothing/mask.dmi differ diff --git a/icons/mob/inhands/equipment/custodial_lefthand.dmi b/icons/mob/inhands/equipment/custodial_lefthand.dmi index 2c9f34af2e1d..9d7b64b16d52 100644 Binary files a/icons/mob/inhands/equipment/custodial_lefthand.dmi and b/icons/mob/inhands/equipment/custodial_lefthand.dmi differ diff --git a/icons/mob/inhands/equipment/custodial_righthand.dmi b/icons/mob/inhands/equipment/custodial_righthand.dmi index f166ba6076bd..cc411eb21963 100644 Binary files a/icons/mob/inhands/equipment/custodial_righthand.dmi and b/icons/mob/inhands/equipment/custodial_righthand.dmi differ diff --git a/icons/mob/inhands/equipment/kitchen_lefthand.dmi b/icons/mob/inhands/equipment/kitchen_lefthand.dmi index 428960e90086..3848a84d00c6 100644 Binary files a/icons/mob/inhands/equipment/kitchen_lefthand.dmi and b/icons/mob/inhands/equipment/kitchen_lefthand.dmi differ diff --git a/icons/mob/inhands/equipment/kitchen_righthand.dmi b/icons/mob/inhands/equipment/kitchen_righthand.dmi index f0c1682b68ed..62330ebfef69 100644 Binary files a/icons/mob/inhands/equipment/kitchen_righthand.dmi and b/icons/mob/inhands/equipment/kitchen_righthand.dmi differ diff --git a/icons/mob/inhands/equipment/tools_lefthand.dmi b/icons/mob/inhands/equipment/tools_lefthand.dmi index 7d66b946aa1f..772b67e7449d 100644 Binary files a/icons/mob/inhands/equipment/tools_lefthand.dmi and b/icons/mob/inhands/equipment/tools_lefthand.dmi differ diff --git a/icons/mob/inhands/equipment/tools_righthand.dmi b/icons/mob/inhands/equipment/tools_righthand.dmi index 1b5a50042923..f48c4df6895a 100644 Binary files a/icons/mob/inhands/equipment/tools_righthand.dmi and b/icons/mob/inhands/equipment/tools_righthand.dmi differ diff --git a/icons/obj/clothing/faction/ngr/belt.dmi b/icons/obj/clothing/faction/ngr/belt.dmi new file mode 100644 index 000000000000..d88e67d332ba Binary files /dev/null and b/icons/obj/clothing/faction/ngr/belt.dmi differ diff --git a/icons/obj/clothing/faction/ngr/eyes.dmi b/icons/obj/clothing/faction/ngr/eyes.dmi new file mode 100644 index 000000000000..8359963e7212 Binary files /dev/null and b/icons/obj/clothing/faction/ngr/eyes.dmi differ diff --git a/icons/obj/clothing/faction/ngr/head.dmi b/icons/obj/clothing/faction/ngr/head.dmi new file mode 100644 index 000000000000..822766336620 Binary files /dev/null and b/icons/obj/clothing/faction/ngr/head.dmi differ diff --git a/icons/obj/clothing/faction/ngr/mask.dmi b/icons/obj/clothing/faction/ngr/mask.dmi new file mode 100644 index 000000000000..c867f6f569d7 Binary files /dev/null and b/icons/obj/clothing/faction/ngr/mask.dmi differ diff --git a/icons/obj/clothing/faction/ngr/neck.dmi b/icons/obj/clothing/faction/ngr/neck.dmi new file mode 100644 index 000000000000..3da79f8da04b Binary files /dev/null and b/icons/obj/clothing/faction/ngr/neck.dmi differ diff --git a/icons/obj/clothing/faction/ngr/suits.dmi b/icons/obj/clothing/faction/ngr/suits.dmi new file mode 100644 index 000000000000..49344c553e03 Binary files /dev/null and b/icons/obj/clothing/faction/ngr/suits.dmi differ diff --git a/icons/obj/clothing/faction/ngr/uniforms.dmi b/icons/obj/clothing/faction/ngr/uniforms.dmi new file mode 100644 index 000000000000..e1b5e1faf5e8 Binary files /dev/null and b/icons/obj/clothing/faction/ngr/uniforms.dmi differ diff --git a/icons/obj/janitor.dmi b/icons/obj/janitor.dmi index dff68c8d4482..f3b4d79436ef 100644 Binary files a/icons/obj/janitor.dmi and b/icons/obj/janitor.dmi differ diff --git a/icons/obj/kitchen.dmi b/icons/obj/kitchen.dmi index a0bbca6bff9e..90d6ca121193 100644 Binary files a/icons/obj/kitchen.dmi and b/icons/obj/kitchen.dmi differ diff --git a/icons/obj/watercloset.dmi b/icons/obj/watercloset.dmi index 4fefb4a22bfc..a9f32f001798 100644 Binary files a/icons/obj/watercloset.dmi and b/icons/obj/watercloset.dmi differ diff --git a/shiptest.dme b/shiptest.dme index 2e0bdaa035f2..93a0e5ce41f5 100644 --- a/shiptest.dme +++ b/shiptest.dme @@ -1950,6 +1950,7 @@ #include "code\modules\clothing\factions\clip.dm" #include "code\modules\clothing\factions\gezena.dm" #include "code\modules\clothing\factions\nanotrasen.dm" +#include "code\modules\clothing\factions\ngr.dm" #include "code\modules\clothing\factions\suns.dm" #include "code\modules\clothing\glasses\_glasses.dm" #include "code\modules\clothing\glasses\engine_goggles.dm"