diff --git a/_maps/configs/independent_nemo.json b/_maps/configs/independent_nemo.json index 8733d8aa0d1e..f10c28ec54fb 100644 --- a/_maps/configs/independent_nemo.json +++ b/_maps/configs/independent_nemo.json @@ -34,7 +34,7 @@ "slots": 1 }, "Mech Pilot": { - "outfit": "/datum/outfit/job/roboticist/technician", + "outfit": "/datum/outfit/job/roboticist", "slots": 1 }, "Ship Engineer": { diff --git a/_maps/configs/independent_rigger.json b/_maps/configs/independent_rigger.json index 8229cee469de..e9a925e0e191 100644 --- a/_maps/configs/independent_rigger.json +++ b/_maps/configs/independent_rigger.json @@ -43,7 +43,7 @@ "slots": 2 }, "Mech Technician": { - "outfit": "/datum/outfit/job/roboticist/technician", + "outfit": "/datum/outfit/job/roboticist", "slots": 1 }, "Security Detail": { diff --git a/_maps/configs/minutemen_asclepius.json b/_maps/configs/minutemen_asclepius.json index 6923097d0447..f457540a8e0c 100644 --- a/_maps/configs/minutemen_asclepius.json +++ b/_maps/configs/minutemen_asclepius.json @@ -17,32 +17,32 @@ "limit": 1, "job_slots": { "Captain": { - "outfit": "/datum/outfit/job/captain/minutemen", + "outfit": "/datum/outfit/job/minuteman/captain", "officer": true, "slots": 1 }, "Mechanic": { - "outfit": "/datum/outfit/job/engineer/minutemen", + "outfit": "/datum/outfit/job/minuteman/engineer", "slots": 1 }, "Minuteman": { - "outfit": "/datum/outfit/job/security/minutemen", + "outfit": "/datum/outfit/job/minuteman/security", "slots": 1 }, "Cadet": { - "outfit": "/datum/outfit/job/assistant/minutemen", + "outfit": "/datum/outfit/job/minuteman/assistant", "slots": 3 }, "Field Medic": { - "outfit": "/datum/outfit/job/doctor/minutemen", + "outfit": "/datum/outfit/job/minuteman/doctor", "slots": 3 }, "Paramedic":{ - "outfit": "/datum/outfit/job/paramedic/minutemen", + "outfit": "/datum/outfit/job/minuteman/paramedic", "slots": 2 }, "Chemist":{ - "outfit": "/datum/outfit/job/chemist/minutemen", + "outfit": "/datum/outfit/job/minuteman/chemist", "slots": 1 } }, diff --git a/_maps/configs/minutemen_cepheus.json b/_maps/configs/minutemen_cepheus.json index c82468a59349..a9862c093d8b 100644 --- a/_maps/configs/minutemen_cepheus.json +++ b/_maps/configs/minutemen_cepheus.json @@ -15,28 +15,28 @@ "limit": 1, "job_slots": { "Captain": { - "outfit": "/datum/outfit/job/captain/minutemen", + "outfit": "/datum/outfit/job/minuteman/captain", "officer": true, "slots": 1 }, "Mechanic": { - "outfit": "/datum/outfit/job/engineer/minutemen", + "outfit": "/datum/outfit/job/minuteman/engineer", "slots": 1 }, "Minuteman": { - "outfit": "/datum/outfit/job/security/minutemen", + "outfit": "/datum/outfit/job/minuteman/security", "slots": 2 }, "Mech Pilot" :{ - "outfit": "/datum/outfit/job/security/minutemen/mechpilot", + "outfit": "/datum/outfit/job/minuteman/security/mech_pilot", "slots": 2 }, "Roboticist": { - "outfit": "/datum/outfit/job/roboticist/technician/minutemen", + "outfit": "/datum/outfit/job/minuteman/roboticist", "slots": 1 }, "Cadet": { - "outfit": "/datum/outfit/job/assistant/minutemen", + "outfit": "/datum/outfit/job/minuteman/assistant", "slots": 3 } }, diff --git a/_maps/configs/minutemen_corvus.json b/_maps/configs/minutemen_corvus.json index 1080c81f59a4..22c6047e3597 100644 --- a/_maps/configs/minutemen_corvus.json +++ b/_maps/configs/minutemen_corvus.json @@ -16,20 +16,20 @@ "limit": 2, "job_slots": { "Captain": { - "outfit": "/datum/outfit/job/captain/minutemen", + "outfit": "/datum/outfit/job/minuteman/captain", "officer": true, "slots": 1 }, "Mechanic": { - "outfit": "/datum/outfit/job/engineer/minutemen", + "outfit": "/datum/outfit/job/minuteman/engineer", "slots": 1 }, "Minuteman": { - "outfit": "/datum/outfit/job/security/minutemen", + "outfit": "/datum/outfit/job/minuteman/security", "slots": 2 }, "Cadet": { - "outfit": "/datum/outfit/job/assistant/minutemen", + "outfit": "/datum/outfit/job/minuteman/assistant", "slots": 2 } }, diff --git a/_maps/configs/minutemen_vela.json b/_maps/configs/minutemen_vela.json index eed473a983ff..e0b4fd046466 100644 --- a/_maps/configs/minutemen_vela.json +++ b/_maps/configs/minutemen_vela.json @@ -2,7 +2,11 @@ "$schema": "https://raw.githubusercontent.com/shiptest-ss13/Shiptest/master/_maps/ship_config_schema.json", "map_name": "Vela-class Industrial Cruiser", "prefix": "CMGSV", - "namelists": ["GENERAL", "MYTHOLOGICAL", "BEASTS"], + "namelists": [ + "GENERAL", + "MYTHOLOGICAL", + "BEASTS" + ], "description": "The Vela-Class is the designation for a series of semi-modular industrial cruisers created by the Colonial Minutemen in the early 440s. While the original design was created almost exclusively for extracting minerals from asteroid belts, modern examples tend to take on a multi-mission role, with the most common configuration being a mech hanger, and research pod. The ship itself often sees long deployments that encourage modification, leading to Velas taking on a personality as their crews leave their mark.", "tags": [ "Robotics", @@ -15,41 +19,41 @@ "limit": 1, "job_slots": { "Captain": { - "outfit": "/datum/outfit/job/captain/minutemen", + "outfit": "/datum/outfit/job/minuteman/captain", "officer": true, "slots": 1 }, "Foreman": { - "outfit": "/datum/outfit/job/ce/minutemen", + "outfit": "/datum/outfit/job/minuteman/ce", "officer": true, "slots": 1 }, "Bridge Officer": { - "outfit": "/datum/outfit/job/head_of_personnel/minutemen", + "outfit": "/datum/outfit/job/minuteman/head_of_personnel", "slots": 1 }, "Mech Pilot": { - "outfit": "/datum/outfit/job/miner/hazard/minutemen", + "outfit": "/datum/outfit/job/minuteman/miner", "slots": 4 }, "Mech Technician": { - "outfit": "/datum/outfit/job/roboticist/technician/minutemen", + "outfit": "/datum/outfit/job/minuteman/roboticist", "slots": 2 }, "Engineer": { - "outfit": "/datum/outfit/job/engineer/minutemen", + "outfit": "/datum/outfit/job/minuteman/engineer", "slots": 2 }, "Minuteman": { - "outfit": "/datum/outfit/job/security/minutemen", + "outfit": "/datum/outfit/job/minuteman/security", "slots": 2 }, "Scientist": { - "outfit": "/datum/outfit/job/scientist/minutemen", + "outfit": "/datum/outfit/job/minuteman/scientist", "slots": 2 }, "Cadet": { - "outfit": "/datum/outfit/job/assistant/minutemen", + "outfit": "/datum/outfit/job/minuteman/assistant", "slots": 1 } }, diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm index 4d44a749146c..ccff1f0e7c8d 100644 --- a/code/game/objects/items/storage/backpack.dm +++ b/code/game/objects/items/storage/backpack.dm @@ -132,7 +132,7 @@ item_state = "securitypack" /obj/item/storage/backpack/security/cmm - name = "cmm backpack" + name = "CMM backpack" desc = "It's a very blue backpack." icon_state = "cmmpack" @@ -286,7 +286,7 @@ item_state = "satchel-sec" /obj/item/storage/backpack/satchel/sec/cmm - name = "cmm satchel" + name = "CMM satchel" desc = "A robust satchel for anti-piracy related needs." icon_state = "satchel-cmm" diff --git a/code/modules/clothing/outfits/minuteman.dm b/code/modules/clothing/outfits/minuteman.dm new file mode 100644 index 000000000000..6bc99b8487b6 --- /dev/null +++ b/code/modules/clothing/outfits/minuteman.dm @@ -0,0 +1,255 @@ +#define FACTION_PLAYER_MINUTEMAN "playerMinuteman" //this needs to be moved to factions.dm when syndicating is merged. + +//top outfit of everything Minuteman. Touch at own risk. + +/datum/outfit/job/minuteman + name = "Colonial Minuteman Empty" + + uniform = /obj/item/clothing/under/rank/security/officer/minutemen + alt_uniform = null + + backpack = /obj/item/storage/backpack/security/cmm + satchel = /obj/item/storage/backpack/satchel/sec/cmm + duffelbag = /obj/item/storage/backpack/duffelbag //to-do: bug rye for cmm duffles + satchel = /obj/item/storage/backpack/messenger //and these + + box = /obj/item/storage/box/survival + +/datum/outfit/job/minuteman/post_equip(mob/living/carbon/human/H, visualsOnly) + . = ..() + if(visualsOnly) + return + H.faction |= list(FACTION_PLAYER_MINUTEMAN) + +///assistant + +/datum/outfit/job/minuteman/assistant + name = "Volunteer (Minutemen)" + jobtype = /datum/job/assistant + + r_pocket = /obj/item/radio + belt = /obj/item/pda + + + +///captains + + +/datum/outfit/job/minuteman/captain + name = "Captain (Minutemen)" + jobtype = /datum/job/captain + + ears = /obj/item/radio/headset/minutemen/alt/captain + uniform = /obj/item/clothing/under/rank/command/minutemen + alt_uniform = null + suit = /obj/item/clothing/suit/toggle/lawyer/minutemen + alt_suit = null + + shoes = /obj/item/clothing/shoes/combat + head = /obj/item/clothing/head/cowboy/sec/minutemen + backpack = /obj/item/storage/backpack + backpack_contents = list(/obj/item/storage/box/ids=1,\ + /obj/item/melee/classic_baton/telescopic=1, /obj/item/modular_computer/tablet/preset/advanced = 1) + +/datum/outfit/job/minuteman/captain/general + name = "General (Minutemen)" + + head = /obj/item/clothing/head/caphat/minutemen + ears = /obj/item/radio/headset/heads/captain + uniform = /obj/item/clothing/under/rank/command/minutemen + suit = /obj/item/clothing/suit/armor/vest/capcarapace/minutemen + shoes = /obj/item/clothing/shoes/combat + + box = /obj/item/storage/box/survival/engineer/radio + backpack = /obj/item/storage/backpack + backpack_contents = list(/obj/item/melee/classic_baton/telescopic=1, /obj/item/gun/ballistic/revolver/mateba=1) + +///chemist + +/datum/outfit/job/minuteman/chemist + name = "Chemical Scientist (Minutemen)" + jobtype = /datum/job/chemist + + glasses = /obj/item/clothing/glasses/science + belt = /obj/item/pda/chemist + shoes = /obj/item/clothing/shoes/sneakers/white + suit = /obj/item/clothing/suit/toggle/labcoat/chemist + + backpack = /obj/item/storage/backpack/chemistry + satchel = /obj/item/storage/backpack/satchel/chem + duffelbag = /obj/item/storage/backpack/duffelbag/med + courierbag = /obj/item/storage/backpack/messenger/chem + + box = /obj/item/storage/box/survival/medical + chameleon_extras = /obj/item/gun/syringe + +///Chief Engineer +/datum/outfit/job/minuteman/ce + name = "Foreman (Minutemen)" + jobtype = /datum/job/chief_engineer + + ears = /obj/item/radio/headset/minutemen/alt + uniform = /obj/item/clothing/under/rank/command/minutemen + alt_uniform = null + suit = /obj/item/clothing/suit/toggle/lawyer/minutemen + alt_suit = null + gloves = /obj/item/clothing/gloves/combat + belt = /obj/item/storage/belt/utility/full + shoes = /obj/item/clothing/shoes/combat + head = /obj/item/clothing/head/cowboy/sec/minutemen + backpack = /obj/item/storage/backpack + backpack_contents = list( + /obj/item/melee/classic_baton/telescopic=1, + /obj/item/modular_computer/tablet/preset/advanced = 1 + ) + +///"Head Of Personnel" + +/datum/outfit/job/minuteman/head_of_personnel + name = "Bridge Officer (Minutemen)" + jobtype = /datum/job/head_of_personnel + + ears = /obj/item/radio/headset/minutemen/alt + uniform = /obj/item/clothing/under/rank/command/minutemen + alt_uniform = null + suit = /obj/item/clothing/suit/toggle/lawyer/minutemen + alt_suit = null + + shoes = /obj/item/clothing/shoes/combat + head = /obj/item/clothing/head/cowboy/sec/minutemen + backpack = /obj/item/storage/backpack + backpack_contents = list(/obj/item/storage/box/ids=1,\ + /obj/item/melee/classic_baton/telescopic=1, /obj/item/modular_computer/tablet/preset/advanced = 1) + +///Medical Doctor +/datum/outfit/job/minuteman/doctor + name = "Field Medic (Minutemen)" + jobtype = /datum/outfit/job/doctor + + uniform = /obj/item/clothing/under/rank/security/officer/minutemen + accessory = /obj/item/clothing/accessory/armband/medblue + shoes = /obj/item/clothing/shoes/sneakers/white + head = /obj/item/clothing/head/beret/med + suit = null + suit_store = null + +///paramedic +/datum/outfit/job/minuteman/paramedic + name = "BARD Combat Medic (Minutemen)" + jobtype = /datum/outfit/job/paramedic + + uniform = /obj/item/clothing/under/rank/medical/paramedic/emt + head = /obj/item/clothing/head/soft/paramedic + suit = /obj/item/clothing/suit/armor/ + +///roboticist +/datum/outfit/job/minuteman/roboticist + name = "Mech Technician (Minutemen)" + jobtype = /datum/outfit/job/roboticist + + uniform = /obj/item/clothing/under/rank/security/officer/minutemen + shoes = /obj/item/clothing/shoes/combat + ears = /obj/item/radio/headset/minutemen + suit = /obj/item/clothing/suit/toggle/labcoat/science + +///scientist +/datum/outfit/job/minuteman/scientist + name = "Scientist (Minutemen)" + jobtype = /datum/job/scientist + + uniform = /obj/item/clothing/under/rank/security/officer/minutemen + backpack = /obj/item/storage/backpack/security/cmm + + +//security officers +/datum/outfit/job/minuteman/security + name = "Minuteman (Minutemen)" + jobtype = /datum/job/officer + + head = /obj/item/clothing/head/helmet/bulletproof/minutemen + mask = /obj/item/clothing/mask/gas/sechailer/minutemen + suit = /obj/item/clothing/suit/armor/vest/bulletproof + uniform = /obj/item/clothing/under/rank/security/officer/minutemen + shoes = /obj/item/clothing/shoes/combat + gloves = /obj/item/clothing/gloves/combat + + belt = /obj/item/storage/belt/military/minutemen + + l_pocket = /obj/item/flashlight/seclite + r_pocket = /obj/item/tank/internals/emergency_oxygen/double + + backpack = /obj/item/storage/backpack/security/cmm + box = /obj/item/storage/box/survival/engineer/radio + backpack_contents = null + +/datum/outfit/job/minuteman/security/armed + name = "Minuteman (Minutemen) (Armed)" + + suit_store = /obj/item/gun/ballistic/automatic/assault/p16/minutemen + belt = /obj/item/storage/belt/military/minutemen/loaded + +/datum/outfit/job/minuteman/security/mech_pilot + name = "Mech Pilot (Minutemen)" + + suit = /obj/item/clothing/suit/armor/vest/alt + gloves = /obj/item/clothing/gloves/tackler/combat/insulated + glasses = /obj/item/clothing/glasses/hud/diagnostic + + backpack_contents = list(/obj/item/melee/classic_baton=1, /obj/item/restraints/handcuffs=1) + +///miners +/datum/outfit/job/minuteman/miner + name = "Industrial Miner (Minutemen)" + jobtype = /datum/job/mining + + + uniform = /obj/item/clothing/under/rank/cargo/miner/hazard + alt_uniform = null + alt_suit = /obj/item/clothing/suit/toggle/hazard + + gloves = /obj/item/clothing/gloves/color/black + shoes = /obj/item/clothing/shoes/combat + backpack_contents = list( + /obj/item/flashlight/seclite=1, + /obj/item/stack/marker_beacon/ten=1, + /obj/item/weldingtool=1 + ) + +///engineers +/datum/outfit/job/minuteman/engineer + name = "Mechanic (Minutemen)" + jobtype = /datum/job/engineer + + uniform = /obj/item/clothing/under/rank/security/officer/minutemen + accessory = /obj/item/clothing/accessory/armband/engine + head = /obj/item/clothing/head/hardhat/dblue + suit = /obj/item/clothing/suit/hazardvest + +///warden +/datum/outfit/job/minuteman/warden + name = "Field Commander (Minutemen)" + jobtype = /datum/job/warden + + glasses = /obj/item/clothing/glasses/sunglasses + ears = /obj/item/radio/headset/minutemen/alt + uniform = /obj/item/clothing/under/rank/security/officer/minutemen + accessory = /obj/item/clothing/accessory/armband + head = /obj/item/clothing/head/cowboy/sec/minutemen + suit = /obj/item/clothing/suit/armor/vest/bulletproof + belt = /obj/item/storage/belt/military/minutemen + shoes = /obj/item/clothing/shoes/combat + + l_pocket = /obj/item/flashlight/seclite + r_pocket = /obj/item/tank/internals/emergency_oxygen/double + + box = /obj/item/storage/box/survival/engineer/radio + backpack = /obj/item/storage/backpack + backpack_contents = null + +/datum/outfit/job/minuteman/warden/armed + name = "Field Commander (Minutemen) (Armed)" + + suit_store = /obj/item/gun/ballistic/automatic/assault/p16/minutemen + belt = /obj/item/storage/belt/military/minutemen/loaded + + backpack_contents = list(/obj/item/melee/classic_baton=1, /obj/item/gun/ballistic/automatic/pistol/commander=1, /obj/item/restraints/handcuffs=1, /obj/item/gun/energy/e_gun/advtaser=1) diff --git a/code/modules/jobs/job_types/assistant.dm b/code/modules/jobs/job_types/assistant.dm index b6e6c9e2b731..3a314ce0748a 100644 --- a/code/modules/jobs/job_types/assistant.dm +++ b/code/modules/jobs/job_types/assistant.dm @@ -70,12 +70,6 @@ Assistant //Shiptest outfits -/datum/outfit/job/assistant/minutemen - name = "Volunteer (Minutemen)" - - uniform = /obj/item/clothing/under/rank/security/officer/minutemen - backpack = /obj/item/storage/backpack/security/cmm - /datum/outfit/job/assistant/inteq name = "IRMG Recruit (Inteq)" diff --git a/code/modules/jobs/job_types/captain.dm b/code/modules/jobs/job_types/captain.dm index 42be4234f7f6..19f2311c0631 100644 --- a/code/modules/jobs/job_types/captain.dm +++ b/code/modules/jobs/job_types/captain.dm @@ -27,8 +27,8 @@ gloves = /obj/item/clothing/gloves/color/captain ears = /obj/item/radio/headset/heads/captain uniform = /obj/item/clothing/under/rank/command/captain - alt_uniform = /obj/item/clothing/under/rank/command/captain/parade //WS Edit - Alt Uniforms - dcoat = /obj/item/clothing/suit/hooded/wintercoat/captain //WS Edit - Alt Uniforms + alt_uniform = /obj/item/clothing/under/rank/command/captain/parade + dcoat = /obj/item/clothing/suit/hooded/wintercoat/captain shoes = /obj/item/clothing/shoes/sneakers/brown head = /obj/item/clothing/head/caphat backpack_contents = list(/obj/item/melee/classic_baton/telescopic=1) @@ -164,34 +164,6 @@ gloves = /obj/item/clothing/gloves/combat suit = /obj/item/clothing/suit/armor/vest/capcarapace/syndicate -/datum/outfit/job/captain/minutemen - name = "Captain (Colonial Minutemen)" - - ears = /obj/item/radio/headset/heads/captain/alt - uniform = /obj/item/clothing/under/rank/command/minutemen - alt_uniform = null - suit = /obj/item/clothing/suit/toggle/lawyer/minutemen - alt_suit = null - - shoes = /obj/item/clothing/shoes/combat - head = /obj/item/clothing/head/cowboy/sec/minutemen - backpack = /obj/item/storage/backpack - backpack_contents = list(/obj/item/storage/box/ids=1,\ - /obj/item/melee/classic_baton/telescopic=1, /obj/item/modular_computer/tablet/preset/advanced = 1) - -/datum/outfit/job/captain/minutemen/general - name = "General (Colonial Minutemen)" - - head = /obj/item/clothing/head/caphat/minutemen - ears = /obj/item/radio/headset/heads/captain - uniform = /obj/item/clothing/under/rank/command/minutemen - suit = /obj/item/clothing/suit/armor/vest/capcarapace/minutemen - shoes = /obj/item/clothing/shoes/combat - - box = /obj/item/storage/box/survival/engineer/radio - backpack = /obj/item/storage/backpack - backpack_contents = list(/obj/item/melee/classic_baton/telescopic=1, /obj/item/gun/ballistic/revolver/mateba=1) - /datum/outfit/job/captain/independent/owner name = "Private Ship Owner (Independent)" diff --git a/code/modules/jobs/job_types/chemist.dm b/code/modules/jobs/job_types/chemist.dm index 9e26a0787865..f34ccd3d5ded 100644 --- a/code/modules/jobs/job_types/chemist.dm +++ b/code/modules/jobs/job_types/chemist.dm @@ -99,9 +99,5 @@ gloves = /obj/item/clothing/gloves/color/latex glasses = /obj/item/clothing/glasses/sunglasses -/datum/outfit/job/chemist/minutemen - name = "Chemical Scientist(minutemen)" - suit = /obj/item/clothing/suit/toggle/labcoat/chemist - ears = /obj/item/radio/headset/minutemen diff --git a/code/modules/jobs/job_types/chief_engineer.dm b/code/modules/jobs/job_types/chief_engineer.dm index 76d49f4b0f4d..6f3205a61512 100644 --- a/code/modules/jobs/job_types/chief_engineer.dm +++ b/code/modules/jobs/job_types/chief_engineer.dm @@ -131,21 +131,3 @@ shoes = /obj/item/clothing/shoes/combat gloves = /obj/item/clothing/gloves/combat belt = /obj/item/storage/belt/utility/full - -/datum/outfit/job/ce/minutemen - name = "Foreman (Colonial Minutemen)" - - ears = /obj/item/radio/headset/minutemen/alt - uniform = /obj/item/clothing/under/rank/command/minutemen - alt_uniform = null - suit = /obj/item/clothing/suit/toggle/lawyer/minutemen - alt_suit = null - gloves = /obj/item/clothing/gloves/combat - belt = /obj/item/storage/belt/utility/full - shoes = /obj/item/clothing/shoes/combat - head = /obj/item/clothing/head/cowboy/sec/minutemen - backpack = /obj/item/storage/backpack - backpack_contents = list( - /obj/item/melee/classic_baton/telescopic=1, - /obj/item/modular_computer/tablet/preset/advanced = 1 - ) diff --git a/code/modules/jobs/job_types/head_of_personnel.dm b/code/modules/jobs/job_types/head_of_personnel.dm index 2e97961b7fcb..47060a5050c0 100644 --- a/code/modules/jobs/job_types/head_of_personnel.dm +++ b/code/modules/jobs/job_types/head_of_personnel.dm @@ -80,21 +80,6 @@ accessory = /obj/item/clothing/accessory/waistcoat head = /obj/item/clothing/head/HoS/cowboy -/datum/outfit/job/head_of_personnel/minutemen - name = "Bridge Officer (Colonial Minutemen)" - - ears = /obj/item/radio/headset/minutemen/alt - uniform = /obj/item/clothing/under/rank/command/minutemen - alt_uniform = null - suit = /obj/item/clothing/suit/toggle/lawyer/minutemen - alt_suit = null - - shoes = /obj/item/clothing/shoes/combat - head = /obj/item/clothing/head/cowboy/sec/minutemen - backpack = /obj/item/storage/backpack - backpack_contents = list(/obj/item/storage/box/ids=1,\ - /obj/item/melee/classic_baton/telescopic=1, /obj/item/modular_computer/tablet/preset/advanced = 1) - /datum/outfit/job/head_of_personnel/syndicate name = "Bridge Officer (Syndicate)" diff --git a/code/modules/jobs/job_types/medical_doctor.dm b/code/modules/jobs/job_types/medical_doctor.dm index 49a23855c3c8..08872575b5f7 100644 --- a/code/modules/jobs/job_types/medical_doctor.dm +++ b/code/modules/jobs/job_types/medical_doctor.dm @@ -91,14 +91,7 @@ //Shiptest outfits -/datum/outfit/job/doctor/minutemen - name = "Field Medic (Colonial Minutemen)" - uniform = /obj/item/clothing/under/rank/security/officer/minutemen - accessory = /obj/item/clothing/accessory/armband/medblue - shoes = /obj/item/clothing/shoes/sneakers/white - head = /obj/item/clothing/head/beret/med - suit = null - suit_store = null + /datum/outfit/job/doctor/pirate name = "Ship's Doctor (Pirate)" diff --git a/code/modules/jobs/job_types/paramedic.dm b/code/modules/jobs/job_types/paramedic.dm index a51249c10f7d..fac29f879ef2 100644 --- a/code/modules/jobs/job_types/paramedic.dm +++ b/code/modules/jobs/job_types/paramedic.dm @@ -78,10 +78,3 @@ shoes = /obj/item/clothing/shoes/combat belt = /obj/item/storage/belt/medical/webbing/paramedic ears = /obj/item/radio/headset/headset_medsec/alt - -/datum/outfit/job/paramedic/minutemen - name = "BARD Combat Medic (Minutemen)" - - uniform = /obj/item/clothing/under/rank/medical/paramedic/emt - head = /obj/item/clothing/head/soft/paramedic - suit = /obj/item/clothing/suit/armor/ diff --git a/code/modules/jobs/job_types/roboticist.dm b/code/modules/jobs/job_types/roboticist.dm index d842f57edf37..97b25ec6b276 100644 --- a/code/modules/jobs/job_types/roboticist.dm +++ b/code/modules/jobs/job_types/roboticist.dm @@ -28,14 +28,6 @@ pda_slot = ITEM_SLOT_LPOCKET -/datum/outfit/job/roboticist/technician/minutemen - name = "Mech Technician (Minutemen)" - - uniform = /obj/item/clothing/under/rank/security/officer/minutemen - shoes = /obj/item/clothing/shoes/combat - ears = /obj/item/radio/headset/minutemen - suit = /obj/item/clothing/suit/toggle/labcoat/science - /datum/outfit/job/roboticist/heron name = "Mech Technician (Nanotrasen)" diff --git a/code/modules/jobs/job_types/scientist.dm b/code/modules/jobs/job_types/scientist.dm index 78f0407d2604..7be90e506c5d 100644 --- a/code/modules/jobs/job_types/scientist.dm +++ b/code/modules/jobs/job_types/scientist.dm @@ -32,8 +32,3 @@ if(prob(0.4)) neck = /obj/item/clothing/neck/tie/horrible -/datum/outfit/job/scientist/minutemen - name = "Scientist (Minutemen)" - - uniform = /obj/item/clothing/under/rank/security/officer/minutemen - backpack = /obj/item/storage/backpack/security/cmm diff --git a/code/modules/jobs/job_types/security_officer.dm b/code/modules/jobs/job_types/security_officer.dm index 781e6f360dc5..4a5935b6316a 100644 --- a/code/modules/jobs/job_types/security_officer.dm +++ b/code/modules/jobs/job_types/security_officer.dm @@ -128,55 +128,6 @@ GLOBAL_LIST_INIT(available_depts, list(SEC_DEPT_ENGINEERING, SEC_DEPT_MEDICAL, S glasses = /obj/item/clothing/glasses/hud/security/sunglasses head = /obj/item/clothing/head/cowboy/sec -/datum/outfit/job/security/minutemen - name = "Minuteman (Colonial Minutemen)" - - head = /obj/item/clothing/head/helmet/bulletproof/minutemen - mask = /obj/item/clothing/mask/gas/sechailer/minutemen - suit = /obj/item/clothing/suit/armor/vest/bulletproof - uniform = /obj/item/clothing/under/rank/security/officer/minutemen - shoes = /obj/item/clothing/shoes/combat - gloves = /obj/item/clothing/gloves/combat - - belt = /obj/item/storage/belt/military/minutemen - - l_pocket = /obj/item/flashlight/seclite - r_pocket = /obj/item/tank/internals/emergency_oxygen/double - - backpack = /obj/item/storage/backpack/security/cmm - box = /obj/item/storage/box/survival/engineer/radio - backpack_contents = null - -/datum/outfit/job/security/minutemen/naked - name = "Minuteman (Colonial Minutemen) (Naked)" - - head = null - suit = null - mask = null - shoes = null - gloves = null - ears = null - - belt = null - - l_pocket = null - r_pocket = null - -/datum/outfit/job/security/minutemen/armed - name = "Minuteman (Colonial Minutemen) (Armed)" - - suit_store = /obj/item/gun/ballistic/automatic/assault/p16/minutemen - belt = /obj/item/storage/belt/military/minutemen/loaded - -/datum/outfit/job/security/minutemen/mechpilot - name = "Mech Pilot (Colonial Minutemen)" - - suit = /obj/item/clothing/suit/armor/vest/alt - gloves = /obj/item/clothing/gloves/tackler/combat/insulated - glasses = /obj/item/clothing/glasses/hud/diagnostic - - backpack_contents = list(/obj/item/melee/classic_baton=1, /obj/item/restraints/handcuffs=1) - /datum/outfit/job/security/inteq name = "IRMG Enforcer (Inteq)" diff --git a/code/modules/jobs/job_types/shaft_miner.dm b/code/modules/jobs/job_types/shaft_miner.dm index 1fade6b2ecf0..4219de5b46e3 100644 --- a/code/modules/jobs/job_types/shaft_miner.dm +++ b/code/modules/jobs/job_types/shaft_miner.dm @@ -185,14 +185,3 @@ head = /obj/item/clothing/head/hardhat/orange suit = /obj/item/clothing/suit/toggle/industrial suit_store = /obj/item/tank/internals/emergency_oxygen/double - -/datum/outfit/job/miner/hazard/minutemen - name = "Industrial Miner (Minutemen)" - gloves = /obj/item/clothing/gloves/color/black - shoes = /obj/item/clothing/shoes/combat - backpack_contents = list( - /obj/item/flashlight/seclite=1, - /obj/item/stack/marker_beacon/ten=1, - /obj/item/weldingtool=1 - ) - diff --git a/code/modules/jobs/job_types/station_engineer.dm b/code/modules/jobs/job_types/station_engineer.dm index cf774d8a25bb..18904a987fea 100644 --- a/code/modules/jobs/job_types/station_engineer.dm +++ b/code/modules/jobs/job_types/station_engineer.dm @@ -53,14 +53,6 @@ uniform = /obj/item/clothing/under/rank/engineering/engineer/nt head = /obj/item/clothing/head/hardhat -/datum/outfit/job/engineer/minutemen - name = "Mechanic (Colonial Minutemen)" - - uniform = /obj/item/clothing/under/rank/security/officer/minutemen - accessory = /obj/item/clothing/accessory/armband/engine - head = /obj/item/clothing/head/hardhat/dblue - suit = /obj/item/clothing/suit/hazardvest - /datum/outfit/job/engineer/inteq name = "IRMG Artificer (Inteq)" diff --git a/code/modules/jobs/job_types/warden.dm b/code/modules/jobs/job_types/warden.dm index a59b68a49892..e84a0034cc4d 100644 --- a/code/modules/jobs/job_types/warden.dm +++ b/code/modules/jobs/job_types/warden.dm @@ -55,33 +55,6 @@ l_pocket = /obj/item/ammo_box/magazine/pistol556mm chameleon_extras = null -/datum/outfit/job/warden/minutemen - name = "Field Commander (Colonial Minutemen)" - - glasses = /obj/item/clothing/glasses/sunglasses - ears = /obj/item/radio/headset/minutemen/alt - uniform = /obj/item/clothing/under/rank/security/officer/minutemen - accessory = /obj/item/clothing/accessory/armband - head = /obj/item/clothing/head/cowboy/sec/minutemen - suit = /obj/item/clothing/suit/armor/vest/bulletproof - belt = /obj/item/storage/belt/military/minutemen - shoes = /obj/item/clothing/shoes/combat - - l_pocket = /obj/item/flashlight/seclite - r_pocket = /obj/item/tank/internals/emergency_oxygen/double - - box = /obj/item/storage/box/survival/engineer/radio - backpack = /obj/item/storage/backpack - backpack_contents = null - -/datum/outfit/job/warden/minutemen/armed - name = "Field Commander (Colonial Minutemen) (Armed)" - - suit_store = /obj/item/gun/ballistic/automatic/assault/p16/minutemen - belt = /obj/item/storage/belt/military/minutemen/loaded - - backpack_contents = list(/obj/item/melee/classic_baton=1, /obj/item/gun/ballistic/automatic/pistol/commander=1, /obj/item/restraints/handcuffs=1, /obj/item/gun/energy/e_gun/advtaser=1) - /datum/outfit/job/warden/inteq name = "Master At Arms (Inteq)" diff --git a/shiptest.dme b/shiptest.dme index 7ead98a88333..e96af391c6b0 100644 --- a/shiptest.dme +++ b/shiptest.dme @@ -1946,6 +1946,7 @@ #include "code\modules\clothing\neck\_neck.dm" #include "code\modules\clothing\outfits\ert.dm" #include "code\modules\clothing\outfits\event.dm" +#include "code\modules\clothing\outfits\minuteman.dm" #include "code\modules\clothing\outfits\plasmaman.dm" #include "code\modules\clothing\outfits\solgov.dm" #include "code\modules\clothing\outfits\standard.dm"