diff --git a/_maps/configs/srm_elder.json b/_maps/configs/srm_elder.json index 82e104096b00..03caf7196183 100644 --- a/_maps/configs/srm_elder.json +++ b/_maps/configs/srm_elder.json @@ -22,17 +22,30 @@ "officer": true, "slots": 1 }, + "Hunter Colligne": { + "outfit": "/datum/outfit/job/roumain/hop", + "officer": true, + "slots": 1 + }, "Hunter Doctor": { "outfit": "/datum/outfit/job/roumain/doctor", "slots": 1 }, + "Machinist": { + "outfit": "/datum/outfit/job/roumain/engineer", + "slots": 1 + }, "Hunter": { "outfit": "/datum/outfit/job/roumain/security", "slots": 3 }, + "Flamebearer": { + "outfit": "/datum/outfit/job/roumain/flamebearer", + "slots": 1 + }, "Shadow": { "outfit": "/datum/outfit/job/roumain/assistant", - "slots": 3 + "slots": 2 } }, "enabled": true diff --git a/_maps/shuttles/roumain/srm_elder.dmm b/_maps/shuttles/roumain/srm_elder.dmm index 5ea4e25b4687..8a411993f382 100644 --- a/_maps/shuttles/roumain/srm_elder.dmm +++ b/_maps/shuttles/roumain/srm_elder.dmm @@ -1056,12 +1056,12 @@ /area/ship/roumain) "lA" = ( /obj/machinery/suit_storage_unit/inherit, -/obj/item/clothing/suit/space/hardsuit/mining/independent, -/obj/item/clothing/mask/breath, -/obj/item/tank/internals/emergency_oxygen/double, /obj/effect/turf_decal/spline/fancy/wood{ dir = 6 }, +/obj/item/clothing/suit/space/hardsuit/solgov/roumain, +/obj/item/clothing/mask/breath, +/obj/item/tank/internals/emergency_oxygen/double, /turf/open/floor/wood/mahogany, /area/ship/bridge) "lM" = ( @@ -1523,6 +1523,24 @@ /obj/structure/catwalk/over/plated_catwalk/dark, /turf/open/floor/plating, /area/ship/engineering/atmospherics) +"rN" = ( +/obj/item/clothing/under/suit/roumain, +/obj/item/clothing/suit/armor/roumain/shadow, +/obj/item/clothing/head/cowboy/sec/roumain/shadow, +/obj/item/flashlight/lantern, +/obj/structure/closet/secure_closet/shadow, +/obj/item/lighter, +/obj/item/clothing/shoes/cowboy, +/obj/item/clothing/shoes/cowboy/black, +/obj/item/clothing/shoes/combat, +/obj/item/kitchen/knife/hunting, +/obj/item/gps{ + pixel_x = -7 + }, +/obj/item/storage/backpack/satchel/leather, +/obj/item/clothing/accessory/waistcoat/roumain, +/turf/open/floor/wood/ebony, +/area/ship/storage) "rW" = ( /obj/machinery/smartfridge/drying_rack, /turf/open/floor/ship/dirt/dark, @@ -1669,6 +1687,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on/layer4{ dir = 8 }, +/obj/structure/chair/wood/wings, /turf/open/floor/wood/mahogany, /area/ship/bridge) "up" = ( @@ -1987,8 +2006,8 @@ /obj/item/clothing/shoes/cowboy, /obj/item/clothing/shoes/cowboy/black, /obj/item/clothing/under/suit/roumain, -/obj/item/clothing/suit/armor/hos/roumain/montagne, -/obj/item/clothing/head/HoS/cowboy/montagne, +/obj/item/clothing/suit/armor/roumain/montagne, +/obj/item/clothing/head/cowboy/sec/roumain/montagne, /obj/item/flashlight/lantern, /obj/item/storage/fancy/candle_box{ pixel_y = 3; @@ -2010,6 +2029,7 @@ /obj/item/ammo_box/c45_speedloader, /obj/item/ammo_box/c45_speedloader, /obj/item/ammo_box/c45, +/obj/item/clothing/accessory/waistcoat/roumain, /turf/open/floor/wood/mahogany, /area/ship/bridge) "zH" = ( @@ -2435,6 +2455,7 @@ /obj/machinery/power/apc/auto_name/directional/east, /obj/structure/cable, /obj/structure/catwalk/over/plated_catwalk/dark, +/obj/structure/destructible/tribal_torch, /turf/open/floor/plating, /area/ship/engineering/engine) "DV" = ( @@ -2629,6 +2650,7 @@ pixel_x = -7 }, /obj/item/storage/backpack/satchel/leather, +/obj/item/clothing/accessory/waistcoat/roumain, /turf/open/floor/wood/ebony, /area/ship/storage) "HB" = ( @@ -2656,10 +2678,33 @@ /turf/open/floor/wood/maple, /area/ship/hallway/starboard) "HO" = ( -/obj/structure/chair/wood/wings, +/obj/item/clothing/shoes/combat, +/obj/item/clothing/under/suit/roumain, +/obj/item/flashlight/lantern, +/obj/item/storage/fancy/candle_box{ + pixel_y = 3; + pixel_x = 8 + }, +/obj/item/lighter{ + pixel_x = -2; + pixel_y = 2 + }, +/obj/item/kitchen/knife/combat, /obj/effect/turf_decal/spline/fancy/wood{ dir = 5 }, +/obj/item/gps{ + pixel_x = -7 + }, +/obj/item/storage/backpack/satchel/leather, +/obj/item/gun/ballistic/revolver/detective, +/obj/item/ammo_box/c38, +/obj/item/ammo_box/c38, +/obj/item/ammo_box/c38_box, +/obj/item/clothing/head/cowboy/sec/roumain/colligne, +/obj/item/clothing/suit/armor/roumain/colligne, +/obj/structure/closet/secure_closet/collignes, +/obj/item/clothing/accessory/waistcoat/roumain, /turf/open/floor/wood/mahogany, /area/ship/bridge) "Ii" = ( @@ -3254,17 +3299,26 @@ /turf/open/floor/wood/mahogany, /area/ship/bridge) "Od" = ( -/obj/structure/cable{ - icon_state = "1-4" - }, -/obj/structure/destructible/tribal_torch, +/obj/item/clothing/head/hardhat/solgov, +/obj/item/storage/toolbox/mechanical, +/obj/item/clothing/glasses/welding, +/obj/item/clothing/head/welding, +/obj/structure/catwalk/over/plated_catwalk/dark, /obj/machinery/atmospherics/pipe/simple/supply/hidden/layer2{ dir = 5 }, +/obj/structure/cable{ + icon_state = "1-4" + }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden/layer4{ dir = 5 }, -/obj/structure/catwalk/over/plated_catwalk/dark, +/obj/item/clothing/suit/hazardvest/roumain, +/obj/item/clothing/head/cowboy/sec/roumain/machinist, +/obj/item/clothing/under/suit/roumain, +/obj/item/clothing/shoes/workboots/mining, +/obj/item/storage/belt, +/obj/structure/closet/secure_closet/machinist, /turf/open/floor/plating, /area/ship/engineering/engine) "Oo" = ( @@ -3595,11 +3649,11 @@ /turf/open/floor/plasteel/white, /area/ship/medical) "SR" = ( +/obj/structure/closet/secure_closet/flamebearer, /obj/item/clothing/under/suit/roumain, -/obj/item/clothing/suit/armor/roumain/shadow, -/obj/item/clothing/head/cowboy/sec/roumain/shadow, +/obj/item/clothing/suit/armor/roumain/flamebearer, +/obj/item/clothing/head/cowboy/sec/roumain/flamebearer, /obj/item/flashlight/lantern, -/obj/structure/closet/secure_closet/shadow, /obj/item/lighter, /obj/item/clothing/shoes/cowboy, /obj/item/clothing/shoes/cowboy/black, @@ -3609,6 +3663,7 @@ pixel_x = -7 }, /obj/item/storage/backpack/satchel/leather, +/obj/item/clothing/accessory/waistcoat/roumain, /turf/open/floor/wood/ebony, /area/ship/storage) "Tc" = ( @@ -5069,7 +5124,7 @@ sH sH sH LN -SR +rN sT ds LX @@ -5106,7 +5161,7 @@ sH sH sH LN -SR +rN AN al cY diff --git a/code/game/MapData/shuttles/srm_elder.dm b/code/game/MapData/shuttles/srm_elder.dm index db6561b6550c..71580b599f62 100644 --- a/code/game/MapData/shuttles/srm_elder.dm +++ b/code/game/MapData/shuttles/srm_elder.dm @@ -21,14 +21,31 @@ desc = "The closet of equipment and attire for the aspiring shadow." icon_state = "cabinet" +/obj/structure/closet/secure_closet/flamebearer + name = "flamebearer's locker" + desc = "The closet of equipment an ascetic Flamebearer would require." + icon_state = "cabinet" + /obj/structure/closet/secure_closet/hunter name = "hunter's locker" desc = "Everything a hunter will need, held in one secure closet." icon_state = "cabinet" req_access = list(ACCESS_SECURITY) +/obj/structure/closet/secure_closet/machinist + name = "machinist's Locker" + desc = "The personal closet with tools of a Machinist." + req_access = list(ACCESS_ENGINE) + icon_state = "eng_secure" + +/obj/structure/closet/secure_closet/collignes + name = "\proper hunter colligne's locker" + desc = "The posessions of the Hunter Colligne aboard the vessel." + req_access = list(ACCESS_HOP) + icon_state = "hop" + /obj/structure/closet/secure_closet/montagnes - name = "\proper Hunter Montagnes Locker" + name = "\proper hunter montagne's locker" desc = "The posessions of the owning Hunter Montagnes." req_access = list(ACCESS_HOS) icon_state = "hos" diff --git a/code/modules/clothing/factions/srm.dm b/code/modules/clothing/factions/srm.dm new file mode 100644 index 000000000000..84b1f0b12640 --- /dev/null +++ b/code/modules/clothing/factions/srm.dm @@ -0,0 +1,154 @@ +////////////// +//Jumpsuits// +///////////// + +/obj/item/clothing/under/suit/roumain + name = "saint-roumain's worksuit" + desc = "A simple, hard-wearing suit designed for the hardworking hunters of the Saint-Roumain Militia." + icon_state = "rouma_work" + item_state = "rouma_work" + can_adjust = FALSE + icon = 'icons/obj/clothing/faction/srm/uniforms.dmi' + mob_overlay_icon = 'icons/mob/clothing/faction/srm/uniforms.dmi' + +////////////////// +//Armored suits// +///////////////// + +/obj/item/clothing/suit/armor/roumain + name = "saint-roumain duster" + desc = "A coat made from hard leather. Meant to withstand long hunts in harsh wilderness." + icon_state = "armor_rouma" + item_state = "rouma_coat" + body_parts_covered = CHEST|GROIN|ARMS + cold_protection = CHEST|GROIN|ARMS + heat_protection = CHEST|GROIN|ARMS + icon = 'icons/obj/clothing/faction/srm/suits.dmi' + mob_overlay_icon = 'icons/mob/clothing/faction/srm/suits.dmi' + +/obj/item/clothing/suit/armor/roumain/shadow + name = "saint-roumain shadow duster" + desc = "A coat made from hard leather. Its rough, barely-treated finish is typical of one of the Saint-Roumain Militia's trainees." + icon_state = "armor_rouma_shadow" + item_state = "rouma_shadow_coat" + +/obj/item/clothing/suit/toggle/labcoat/roumain_med + name = "saint-roumain medical duster" + desc = "A coat made from hard leather and further treated with exotic sterilizing oils and wax. The treatment and its more closed design offers much better protection against biological hazards." + icon = 'icons/obj/clothing/faction/srm/suits.dmi' + mob_overlay_icon = 'icons/mob/clothing/faction/srm/suits.dmi' + icon_state = "rouma_med_coat" + armor = list("melee" = 35, "bullet" = 30, "laser" = 30, "energy" = 40, "bomb" = 25, "bio" = 50, "rad" = 0, "fire" = 50, "acid" = 50) + +/obj/item/clothing/suit/hazardvest/roumain + name = "saint-roumain machinist leather vest" + desc = "A modified Roumain leather duster with its large flaps and sleeves cut off to provide extra mobility when maintaining weapons and vessels belonging to the Church of Saint Roumain. Its specialty treatment grants it better protection against acid and fire." + icon = 'icons/obj/clothing/faction/srm/suits.dmi' + mob_overlay_icon = 'icons/mob/clothing/faction/srm/suits.dmi' + icon_state = "armor_rouma_machinist" + item_state = "rouma_coat" + armor = list("melee" = 30, "bullet" = 20, "laser" = 20, "energy" = 40, "bomb" = 35, "bio" = 0, "rad" = 0, "fire" = 60, "acid" = 60) + +/obj/item/clothing/suit/armor/roumain/flamebearer + name = "saint-roumain flamebearer robes" + desc = "A set of ashy-grey robes made from hard leather, adorned with gold trims. Its rough finish after a near-char and application of aromatics is heavily favored for the ecclesiastical sect of the Church of Saint Roumain, a living reminder of the Ashen Huntsman himself." + icon_state = "armor_rouma_flamebearer" + +/obj/item/clothing/suit/armor/roumain/colligne + name = "saint-roumain colligne coat" + desc = "A well-maintained hard leather coat typically worn to denote the rank of Colligne, a trainee Hunter Montagne. It is treated with bullet-resistant materials, and lined with the dark fur of Illestrian dire wolves." + icon_state = "armor_rouma_colligne" + item_state = "rouma_coat" + body_parts_covered = CHEST|GROIN|ARMS|LEGS + cold_protection = CHEST|GROIN|LEGS|ARMS + heat_protection = CHEST|GROIN|LEGS|ARMS + +/obj/item/clothing/suit/armor/roumain/montagne + name = "saint-roumain montagne coat" + desc = "A stylish red coat to indicate that you are, in fact, a Hunter Montagne. Made of extra hard exotic leather, treated with bullet-resistant materials, and lined with the fur of some unidentifiable creature." + icon_state = "armor_rouma_montagne" + item_state = "rouma_montagne_coat" + body_parts_covered = CHEST|GROIN|ARMS|LEGS + armor = list("melee" = 30, "bullet" = 30, "laser" = 30, "energy" = 40, "bomb" = 25, "bio" = 0, "rad" = 0, "fire" = 70, "acid" = 90) + cold_protection = CHEST|GROIN|LEGS|ARMS + heat_protection = CHEST|GROIN|LEGS|ARMS + +/////////////// +//Spacesuits// +////////////// + +/obj/item/clothing/head/helmet/space/hardsuit/solgov/roumain + name = "\improper roumain hardsuit helmet" + desc = "An armored helmet with an unusual design that recalls both pre-industrial Solarian armor and iconography depicting the Ashen Huntsman. Though hand-made, it is surprisingly quite spaceworthy." + icon = 'icons/obj/clothing/faction/srm/head.dmi' + mob_overlay_icon = 'icons/mob/clothing/faction/srm/head.dmi' + icon_state = "hardsuit0-roumain" + item_state = "hardsuit0-roumain" + hardsuit_type = "roumain" + worn_y_offset = 4 + +/obj/item/clothing/suit/space/hardsuit/solgov/roumain + name = "\improper roumain hardsuit" + desc = "A hand-crafted suit of armor either modified from a set of normal plate armor or designed to resemble one. A powered exoskeleton has been cleverly integrated into the design and, surprisingly, it is completely vacuum-proof. Suits like this are a testament to what the master craftsmen of Hunter's Pride are capable of." + icon = 'icons/obj/clothing/faction/srm/suits.dmi' + mob_overlay_icon = 'icons/mob/clothing/faction/srm/suits.dmi' + icon_state = "hardsuit-roumain" + item_state = "hardsuit-roumain" + helmettype = /obj/item/clothing/head/helmet/space/hardsuit/solgov/roumain + slowdown = 0.5 + +///////// +//Hats// +//////// + +/obj/item/clothing/head/cowboy/sec/roumain + name = "hunter's hat" + desc = "A fancy hat with a nice feather. The way it covers your eyes makes you feel like a badass." + icon_state = "rouma_hat" + icon = 'icons/obj/clothing/faction/srm/head.dmi' + mob_overlay_icon = 'icons/mob/clothing/faction/srm/head.dmi' + +/obj/item/clothing/head/cowboy/sec/roumain/shadow + name = "shadow's hat" + desc = "A rough, simple hat. The way it covers your eyes makes you feel badass, but you just look like a wannabe hunter." + icon_state = "rouma_shadow_hat" + +/obj/item/clothing/head/cowboy/sec/roumain/machinist + name = "machinist's hat" + desc = "A small, humble leather top hat. It gives you the gnawing urge to create classical gizmos and goobers, or alternatively repair any breaches within your vessel." + icon_state = "rouma_machinist_hat" + +/obj/item/clothing/head/cowboy/sec/roumain/med + name = "medical hunter's hat" + desc = "A very wide-brimmed, round hat treated with oil and wax. Somehow manages to look stylish and creepy at the same time." + icon_state = "rouma_med_hat" + +/obj/item/clothing/head/cowboy/sec/roumain/flamebearer + name = "flamebearer's hat" + desc = "A wide-brimmed, pointed hat with charred leather, granting it an ash-grey appearance. The design honors the one the Ashen Huntsman himself wore, according to legend." + icon_state = "rouma_flamebearer_hat" + +/obj/item/clothing/head/cowboy/sec/roumain/colligne + name = "colligne's hat" + desc = "A fancy, pointy leather hat with a large feather plume to signal that you are, in fact... A Hunter Colligne. You still have some ways to go before you gain the title of Montagne." + icon_state = "rouma_colligne_hat" + +/obj/item/clothing/head/cowboy/sec/roumain/montagne + name = "montagne's hat" + desc = "A very fancy hat with a large feather plume to signal that you are, in fact, a Hunter Montagne. The exotic fur lining is impeccably soft and bafflingly bulletproof." + icon_state = "rouma_montagne_hat" + +/////////////// +//Accessories// +/////////////// + +//These are stored in clothing/accessories.dmi instead of a factional variant due to accessory code being dogwater +//Please transfer them over to a factional file if accessory code is ever fixed + +/obj/item/clothing/accessory/waistcoat/roumain + name = "roumain waistcoat" + desc = "A warm, red wool waistcoat, worn by any member of the Church of Saint Roumain, though heavily favored by Machinists for the added warmth given to their rather breezy outfit." + icon_state = "rouma_waistcoat" + icon = 'icons/obj/clothing/accessories.dmi' + mob_overlay_icon = 'icons/mob/clothing/accessories.dmi' + minimize_when_attached = TRUE diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm index eb76c13fb541..3e04245e1a14 100644 --- a/code/modules/clothing/head/jobs.dm +++ b/code/modules/clothing/head/jobs.dm @@ -138,26 +138,6 @@ desc = "A robust stetson adorned with a deputy's badge. Its imitation leather is thick and worn." icon_state = "cowboysec" -/obj/item/clothing/head/cowboy/sec/roumain - name = "hunter's hat" - desc = "A fancy hat with a nice feather. The way it covers your eyes makes you feel like a badass." - icon_state = "rouma_hat" - -/obj/item/clothing/head/cowboy/sec/roumain/shadow - name = "shadow's hat" - desc = "A rough, simple hat. The way it covers your eyes makes you feel badass, but you just look like a wannabe hunter." - icon_state = "rouma_shadow_hat" - -/obj/item/clothing/head/cowboy/sec/roumain/med - name = "medical hunter's hat" - desc = "A very wide-brimmed, round hat treated with oil and wax. Somehow manages to look stylish and creepy at the same time." - icon_state = "rouma_med_hat" - -/obj/item/clothing/head/HoS/cowboy/montagne - name = "montagne's hat" - desc = "A very fancy hat with a large feather plume to signal that you are, in fact, a Hunter Montagne. The exotic fur lining is impeccably soft and bafflingly bulletproof." - icon_state = "rouma_montagne_hat" - /obj/item/clothing/head/HoS/syndicate name = "syndicate cap" desc = "A black cap fit for a high ranking syndicate officer." diff --git a/code/modules/clothing/outfits/factions/roumain.dm b/code/modules/clothing/outfits/factions/roumain.dm index 424827e69010..fe31fddd9041 100644 --- a/code/modules/clothing/outfits/factions/roumain.dm +++ b/code/modules/clothing/outfits/factions/roumain.dm @@ -19,7 +19,7 @@ name = "Saint-Roumain Militia - Shadow" id_assignment = "Shadow" jobtype = /datum/job/assistant - job_icon = "assistant" + job_icon = "srm_shadow" uniform = /obj/item/clothing/under/suit/roumain alt_uniform = null @@ -33,14 +33,40 @@ /datum/outfit/job/roumain/captain name = "Saint-Roumain Militia - Hunter Montagne" id_assignment = "Hunter Montagne" - job_icon = "captain" + job_icon = "srm_montagne" jobtype = /datum/job/captain + ears = /obj/item/radio/headset/headset_com/alt + uniform = /obj/item/clothing/under/suit/roumain + shoes = /obj/item/clothing/shoes/workboots/mining + suit = /obj/item/clothing/suit/armor/roumain/montagne + head = /obj/item/clothing/head/cowboy/sec/roumain/montagne + id = /obj/item/card/id/gold + + duffelbag = /obj/item/storage/backpack/cultpack + courierbag = /obj/item/storage/backpack/cultpack + backpack = /obj/item/storage/backpack/cultpack + satchel = /obj/item/storage/backpack/cultpack + + backpack_contents = list(/obj/item/book/manual/srmlore=1, + /obj/item/stamp/chap = 1, + /obj/item/melee/classic_baton/telescopic=1, + ) + chameleon_extras = null + +// Second-In-Command + +/datum/outfit/job/roumain/hop + name = "Saint-Roumain Militia - Hunter Colligne" + id_assignment = "Hunter Colligne" + job_icon = "srm_colligne" + jobtype = /datum/job/head_of_personnel + ears = /obj/item/radio/headset/headset_com uniform = /obj/item/clothing/under/suit/roumain shoes = /obj/item/clothing/shoes/workboots/mining - suit = /obj/item/clothing/suit/armor/hos/roumain/montagne - head = /obj/item/clothing/head/HoS/cowboy/montagne + suit = /obj/item/clothing/suit/armor/roumain/colligne + head = /obj/item/clothing/head/cowboy/sec/roumain/colligne id = /obj/item/card/id/silver duffelbag = /obj/item/storage/backpack/cultpack @@ -58,7 +84,7 @@ name = "Saint-Roumain Militia - Hunter" id_assignment = "Hunter" jobtype = /datum/job/officer - job_icon = "securityofficer" + job_icon = "hsrm_hunter" uniform = /obj/item/clothing/under/suit/roumain alt_uniform = null @@ -74,12 +100,34 @@ backpack_contents = null +// engineer + +/datum/outfit/job/roumain/engineer + name = "Saint-Roumain Militia - Machinist" + id_assignment = "Machinist" + job_icon = "srm_machinist" + jobtype = /datum/job/engineer + + uniform = /obj/item/clothing/under/suit/roumain + alt_uniform = null + shoes = /obj/item/clothing/shoes/workboots/mining + belt = /obj/item/storage/belt/utility/full/engi + suit = /obj/item/clothing/suit/hazardvest/roumain + head = /obj/item/clothing/head/cowboy/sec/roumain/machinist + accessory = /obj/item/clothing/accessory/waistcoat/roumain + gloves = null + + backpack = /obj/item/storage/backpack + satchel = /obj/item/storage/backpack/satchel + duffelbag = /obj/item/storage/backpack/duffelbag + courierbag = /obj/item/storage/backpack/messenger + // Medical Doctor /datum/outfit/job/roumain/doctor name = "Saint-Roumain Militia - Hunter Doctor" id_assignment = "Hunter Doctor" - job_icon = "medicaldoctor" + job_icon = "srm_doctor" jobtype = /datum/job/doctor uniform = /obj/item/clothing/under/suit/roumain @@ -94,3 +142,27 @@ satchel = /obj/item/storage/backpack/satchel duffelbag = /obj/item/storage/backpack/duffelbag courierbag = /obj/item/storage/backpack/messenger + +// Chaplain + +/datum/outfit/job/roumain/flamebearer + name = "Saint-Roumain Militia - Flamebearer" + id_assignment = "Flamebearer" + job_icon = "srm_flamebearer" + jobtype = /datum/job/chaplain + + uniform = /obj/item/clothing/under/suit/roumain + alt_uniform = null + shoes = /obj/item/clothing/shoes/workboots/mining + suit = /obj/item/clothing/suit/armor/roumain/flamebearer + head = /obj/item/clothing/head/cowboy/sec/roumain/flamebearer + gloves = null + + duffelbag = /obj/item/storage/backpack/cultpack + courierbag = /obj/item/storage/backpack/cultpack + backpack = /obj/item/storage/backpack/cultpack + satchel = /obj/item/storage/backpack/cultpack + + backpack_contents = list(/obj/item/book/manual/srmlore=1, + /obj/item/stamp/chap = 1, + ) diff --git a/code/modules/clothing/spacesuits/hardsuit.dm b/code/modules/clothing/spacesuits/hardsuit.dm index 557a69c5acb2..f21367434d01 100644 --- a/code/modules/clothing/spacesuits/hardsuit.dm +++ b/code/modules/clothing/spacesuits/hardsuit.dm @@ -444,27 +444,6 @@ combat_slowdown = 0.5 jetpack = null -//Hardliner Syndie suit -/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 Second Battlegroup." - 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 Second Battlegroup." - icon_state = "hardsuit1-hl" - item_state = "hardsuit1-hl" - 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 Second Battlegroup." - 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 the Second Battlegroup." - icon_state = "hardsuit1-hl" - item_state = "hardsuit1-hl" - hardsuit_type = "hl" - helmettype = /obj/item/clothing/head/helmet/space/hardsuit/syndi/hl - lightweight = 1 - jetpack = null - - //Elite Syndie suit /obj/item/clothing/head/helmet/space/hardsuit/syndi/elite name = "elite syndicate hardsuit helmet" diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index ee72151d9567..9dfd23210d9c 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -360,27 +360,6 @@ /obj/item/melee/baton, ) -/obj/item/clothing/suit/armor/roumain - name = "saint-roumain duster" - desc = "A coat made from hard leather. Meant to withstand long hunts in harsh wilderness." - icon_state = "armor_rouma" - item_state = "rouma_coat" - body_parts_covered = CHEST|GROIN|ARMS - cold_protection = CHEST|GROIN|ARMS - heat_protection = CHEST|GROIN|ARMS - -/obj/item/clothing/suit/armor/roumain/shadow - name = "saint-roumain shadow duster" - desc = "A coat made from hard leather. Its rough, barely-treated finish is typical of one of the Saint-Roumain Militia's trainees." - icon_state = "armor_rouma_shadow" - item_state = "rouma_shadow_coat" - -/obj/item/clothing/suit/armor/hos/roumain/montagne - name = "saint-roumain montagne coat" - desc = "A stylish red coat to indicate that you are, in fact, a Hunter Montagne. Made of extra hard exotic leather, treated with bullet-resistant materials, and lined with the fur of some unidentifiable creature." - icon_state = "armor_rouma_montagne" - item_state = "rouma_montagne_coat" - /obj/item/clothing/suit/armor/vest/bulletproof/solgov name = "\improper Sonnensoldner gambison" desc = "A standard armor vest fielded for SolGov's Sonnensoldners." diff --git a/code/modules/clothing/suits/labcoat.dm b/code/modules/clothing/suits/labcoat.dm index f95a91ab27fe..858b494564e6 100644 --- a/code/modules/clothing/suits/labcoat.dm +++ b/code/modules/clothing/suits/labcoat.dm @@ -68,12 +68,6 @@ You're pretty sure this is just a raincoat. icon_state = "raincoat" item_state = "raincoat" -/obj/item/clothing/suit/toggle/labcoat/roumain_med - name = "saint-roumain medical duster" - desc = "A coat made from hard leather and further treated with exotic sterilizing oils and wax. The treatment and its more closed design offers much better protection against biological hazards." - icon_state = "rouma_med_coat" - armor = list("melee" = 35, "bullet" = 30, "laser" = 30, "energy" = 40, "bomb" = 25, "bio" = 50, "rad" = 0, "fire" = 50, "acid" = 50) - /obj/item/clothing/suit/longcoat name = "longcoat" desc = "A long, victorian styled labcoat." diff --git a/code/modules/clothing/under/suits.dm b/code/modules/clothing/under/suits.dm index 5344ec98d06b..a0ec0a4da5e5 100644 --- a/code/modules/clothing/under/suits.dm +++ b/code/modules/clothing/under/suits.dm @@ -139,12 +139,6 @@ body_parts_covered = CHEST|GROIN|LEGS|FEET|ARMS|HANDS|HEAD flags_inv = HIDEGLOVES|HIDESHOES|HIDEEARS|HIDEEYES|HIDEHAIR -/obj/item/clothing/under/suit/roumain - name = "saint-roumain's worksuit" - desc = "A simple, hard-wearing suit designed for the hardworking hunters of the Saint-Roumain Militia." - icon_state = "rouma_work" - item_state = "rouma_work" - /obj/item/clothing/under/suit/dresssuit name = "navy dress-suit" desc = "A very strange piece of clothing. Mostly navy, but with a pink undershirt. Who would even wear this?" diff --git a/icons/mob/clothing/accessories.dmi b/icons/mob/clothing/accessories.dmi index d23ebfae4756..861bb2701699 100644 Binary files a/icons/mob/clothing/accessories.dmi and b/icons/mob/clothing/accessories.dmi differ diff --git a/icons/mob/clothing/faction/srm/head.dmi b/icons/mob/clothing/faction/srm/head.dmi new file mode 100644 index 000000000000..186d021abeb3 Binary files /dev/null and b/icons/mob/clothing/faction/srm/head.dmi differ diff --git a/icons/mob/clothing/faction/srm/suits.dmi b/icons/mob/clothing/faction/srm/suits.dmi new file mode 100644 index 000000000000..801414dceec7 Binary files /dev/null and b/icons/mob/clothing/faction/srm/suits.dmi differ diff --git a/icons/mob/clothing/faction/srm/uniforms.dmi b/icons/mob/clothing/faction/srm/uniforms.dmi new file mode 100644 index 000000000000..b43a33a34e8d Binary files /dev/null and b/icons/mob/clothing/faction/srm/uniforms.dmi differ diff --git a/icons/mob/clothing/head.dmi b/icons/mob/clothing/head.dmi index c2a73da609b9..f207b2bfd826 100644 Binary files a/icons/mob/clothing/head.dmi and b/icons/mob/clothing/head.dmi differ diff --git a/icons/mob/clothing/suits/armor.dmi b/icons/mob/clothing/suits/armor.dmi index d64a4cbbf04f..4c37ff4d8bff 100644 Binary files a/icons/mob/clothing/suits/armor.dmi and b/icons/mob/clothing/suits/armor.dmi differ diff --git a/icons/mob/clothing/suits/toggle.dmi b/icons/mob/clothing/suits/toggle.dmi index 8ceffd1312c0..99fddcf51169 100644 Binary files a/icons/mob/clothing/suits/toggle.dmi and b/icons/mob/clothing/suits/toggle.dmi differ diff --git a/icons/mob/hud.dmi b/icons/mob/hud.dmi index 3926bce0f3b1..dced69dc5b6f 100644 Binary files a/icons/mob/hud.dmi and b/icons/mob/hud.dmi differ diff --git a/icons/obj/clothing/accessories.dmi b/icons/obj/clothing/accessories.dmi index e0818c6853df..4de00230ac76 100644 Binary files a/icons/obj/clothing/accessories.dmi and b/icons/obj/clothing/accessories.dmi differ diff --git a/icons/obj/clothing/faction/srm/head.dmi b/icons/obj/clothing/faction/srm/head.dmi new file mode 100644 index 000000000000..8503fda7e3cf Binary files /dev/null and b/icons/obj/clothing/faction/srm/head.dmi differ diff --git a/icons/obj/clothing/faction/srm/suits.dmi b/icons/obj/clothing/faction/srm/suits.dmi new file mode 100644 index 000000000000..031fb45e3ba6 Binary files /dev/null and b/icons/obj/clothing/faction/srm/suits.dmi differ diff --git a/icons/obj/clothing/faction/srm/uniforms.dmi b/icons/obj/clothing/faction/srm/uniforms.dmi new file mode 100644 index 000000000000..ec410e52e600 Binary files /dev/null and b/icons/obj/clothing/faction/srm/uniforms.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index cf7f5ff09bd0..402ce131a988 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/suits/armor.dmi b/icons/obj/clothing/suits/armor.dmi index 9eaa67f04a42..232a2f6ec2bd 100644 Binary files a/icons/obj/clothing/suits/armor.dmi and b/icons/obj/clothing/suits/armor.dmi differ diff --git a/icons/obj/clothing/suits/toggle.dmi b/icons/obj/clothing/suits/toggle.dmi index 54df84ad5def..75a2f1a891b3 100644 Binary files a/icons/obj/clothing/suits/toggle.dmi and b/icons/obj/clothing/suits/toggle.dmi differ diff --git a/shiptest.dme b/shiptest.dme index 70a39551e007..7bb3288356ed 100644 --- a/shiptest.dme +++ b/shiptest.dme @@ -1968,6 +1968,7 @@ #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\srm.dm" #include "code\modules\clothing\factions\suns.dm" #include "code\modules\clothing\glasses\_glasses.dm" #include "code\modules\clothing\glasses\engine_goggles.dm"