diff --git a/code/__DEFINES/origins.dm b/code/__DEFINES/origins.dm index 3ea79cc6cca..e00be0f1ee6 100644 --- a/code/__DEFINES/origins.dm +++ b/code/__DEFINES/origins.dm @@ -19,3 +19,4 @@ // UPP #define ORIGIN_UPP "Union of Progressive Peoples" +#define ORIGIN_TWE "Three World Empire" diff --git a/code/__DEFINES/paygrade_defs/twe.dm b/code/__DEFINES/paygrade_defs/twe.dm index da1c6a5fa4f..323df428fea 100644 --- a/code/__DEFINES/paygrade_defs/twe.dm +++ b/code/__DEFINES/paygrade_defs/twe.dm @@ -13,6 +13,9 @@ /// RMC4, Itto-Sergeant #define PAY_SHORT_RMC4 "RMC4" +/// RMC4, Itto-Sergeant +#define PAY_SHORT_RMC5 "RMC5" + /// RNOW, Warrant Officer #define PAY_SHORT_RNOW "RNOW" diff --git a/code/datums/emergency_calls/inspection.dm b/code/datums/emergency_calls/inspection.dm index 46f992f12b5..8c2a5569ee4 100644 --- a/code/datums/emergency_calls/inspection.dm +++ b/code/datums/emergency_calls/inspection.dm @@ -154,13 +154,13 @@ if(!leader && HAS_FLAG(H.client.prefs.toggles_ert, PLAY_LEADER) && check_timelock(H.client, list(JOB_SQUAD_LEADER), time_required_for_job)) leader = H - arm_equipment(H, /datum/equipment_preset/pmc/pmc_leader, TRUE, TRUE) + arm_equipment(H, /datum/equipment_preset/pmc/leader, TRUE, TRUE) to_chat(H, SPAN_ROLE_HEADER("You are a Weyland Yutani PMC Inspector!")) to_chat(H, SPAN_ROLE_BODY("While officially your outfit does mundane security work for Weyland-Yutani, in practice you serve as both official and unofficial investigators into conduct of Company personnel. You are being dispatched to the [MAIN_SHIP_NAME] to make sure that the local Liaison has not forgotten their priorities or worse, thought to bite the hand that feeds them.")) to_chat(H, SPAN_ROLE_BODY("Remember the USCM personnel on the ship may not appreciate your presence there. Should the Liaison be in jail, you are not to act as legal counsel in any way unless instructed to do so by Dispatch. Your basic duty is to make a detailed report of anything involving the Liaison and any other WY personnel on board the ship.")) to_chat(H, SPAN_WARNING("Unless ordered otherwise by Dispatch, you are to avoid open conflict with the Marines. Retreat and make a report if they are outright hostile. Ahelp if you have any more questions or wish to release this character for other players.")) else - arm_equipment(H, /datum/equipment_preset/pmc/pmc_standard, TRUE, TRUE) + arm_equipment(H, /datum/equipment_preset/pmc/standard, TRUE, TRUE) to_chat(H, SPAN_ROLE_HEADER("You are part of a Weyland-Yutani PMC Investigation Team!")) to_chat(H, SPAN_ROLE_BODY("While officially your outfit does mundane security work for Weyland-Yutani, in practice you serve as both official and unofficial investigators into conduct of Company personnel. The Lead Investigator is in charge, your duty is to provide backup, counsel and any other form of assistance you can render to make sure their mission is a success.")) to_chat(H, SPAN_ROLE_BODY("Remember that the USCM, or at least some parts of it, may be hostile towards your presence on the ship. Unless ordered otherwise by Dispatch, you and your Team Leader are to avoid open conflict with the Marines. Your main priority is making sure that your Lead survives to write the report they are due.")) diff --git a/code/datums/emergency_calls/pmc.dm b/code/datums/emergency_calls/pmc.dm index 06fe3d32d78..c042c954922 100644 --- a/code/datums/emergency_calls/pmc.dm +++ b/code/datums/emergency_calls/pmc.dm @@ -34,7 +34,7 @@ if(!leader && HAS_FLAG(mob.client.prefs.toggles_ert, PLAY_LEADER) && check_timelock(mob.client, JOB_SQUAD_LEADER, time_required_for_job)) leader = mob to_chat(mob, SPAN_ROLE_HEADER("You are a Weyland-Yutani PMC Squad Leader!")) - arm_equipment(mob, /datum/equipment_preset/pmc/pmc_leader, TRUE, TRUE) + arm_equipment(mob, /datum/equipment_preset/pmc/leader, TRUE, TRUE) else if(synths < max_synths && HAS_FLAG(mob.client.prefs.toggles_ert, PLAY_SYNTH) && mob.client.check_whitelist_status(WHITELIST_SYNTHETIC)) synths++ to_chat(mob, SPAN_ROLE_HEADER("You are a Weyland-Yutani PMC Support Synthetic!")) @@ -42,18 +42,18 @@ else if(medics < max_medics && HAS_FLAG(mob.client.prefs.toggles_ert, PLAY_MEDIC) && check_timelock(mob.client, JOB_SQUAD_MEDIC, time_required_for_job)) medics++ to_chat(mob, SPAN_ROLE_HEADER("You are a Weyland-Yutani PMC Medic!")) - arm_equipment(mob, /datum/equipment_preset/pmc/pmc_medic, TRUE, TRUE) + arm_equipment(mob, /datum/equipment_preset/pmc/medic, TRUE, TRUE) else if(smartgunners < max_smartgunners && HAS_FLAG(mob.client.prefs.toggles_ert, PLAY_SMARTGUNNER) && check_timelock(mob.client, JOB_SQUAD_SMARTGUN)) smartgunners++ to_chat(mob, SPAN_ROLE_HEADER("You are a Weyland-Yutani PMC Heavy Gunner!")) - arm_equipment(mob, /datum/equipment_preset/pmc/pmc_gunner, TRUE, TRUE) + arm_equipment(mob, /datum/equipment_preset/pmc/gunner, TRUE, TRUE) else if(heavies < max_heavies && HAS_FLAG(mob.client.prefs.toggles_ert, PLAY_HEAVY) && check_timelock(mob.client, JOB_SQUAD_SPECIALIST)) heavies++ to_chat(mob, SPAN_ROLE_HEADER("You are a Weyland-Yutani PMC Sniper!")) - arm_equipment(mob, /datum/equipment_preset/pmc/pmc_sniper, TRUE, TRUE) + arm_equipment(mob, /datum/equipment_preset/pmc/sniper, TRUE, TRUE) else to_chat(mob, SPAN_ROLE_HEADER("You are a Weyland-Yutani PMC Operator!")) - arm_equipment(mob, /datum/equipment_preset/pmc/pmc_standard, TRUE, TRUE) + arm_equipment(mob, /datum/equipment_preset/pmc/standard, TRUE, TRUE) print_backstory(mob) @@ -126,18 +126,18 @@ if(!leader && HAS_FLAG(H.client.prefs.toggles_ert, PLAY_LEADER) && check_timelock(H.client, JOB_SQUAD_LEADER, time_required_for_job)) //First one spawned is always the leader. leader = H to_chat(H, SPAN_ROLE_HEADER("You are a Weyland-Yutani PMC Squad Leader!")) - arm_equipment(H, /datum/equipment_preset/pmc/pmc_leader, TRUE, TRUE) + arm_equipment(H, /datum/equipment_preset/pmc/leader, TRUE, TRUE) else if(medics < max_medics && HAS_FLAG(H.client.prefs.toggles_ert, PLAY_MEDIC) && check_timelock(H.client, JOB_SQUAD_MEDIC, time_required_for_job)) medics++ to_chat(H, SPAN_ROLE_HEADER("You are a Weyland-Yutani PMC Medical Investigator!")) - arm_equipment(H, /datum/equipment_preset/pmc/pmc_medic, TRUE, TRUE) + arm_equipment(H, /datum/equipment_preset/pmc/medic, TRUE, TRUE) else if(heavies < max_heavies && HAS_FLAG(H.client.prefs.toggles_ert, PLAY_SMARTGUNNER) && check_timelock(H.client, JOB_SQUAD_SMARTGUN, time_required_for_job)) heavies++ to_chat(H, SPAN_ROLE_HEADER("You are a Weyland-Yutani PMC Heavy Gunner!")) - arm_equipment(H, /datum/equipment_preset/pmc/pmc_gunner, TRUE, TRUE) + arm_equipment(H, /datum/equipment_preset/pmc/gunner, TRUE, TRUE) else to_chat(H, SPAN_ROLE_HEADER("You are a Weyland-Yutani PMC Detainer!")) - arm_equipment(H, /datum/equipment_preset/pmc/pmc_standard, TRUE, TRUE) + arm_equipment(H, /datum/equipment_preset/pmc/standard, TRUE, TRUE) print_backstory(H) diff --git a/code/datums/emergency_calls/royal_marines.dm b/code/datums/emergency_calls/royal_marines.dm index a614d5a0c1c..2d82e7f48b1 100644 --- a/code/datums/emergency_calls/royal_marines.dm +++ b/code/datums/emergency_calls/royal_marines.dm @@ -28,23 +28,23 @@ if(!leader && HAS_FLAG(mob.client.prefs.toggles_ert, PLAY_LEADER) && check_timelock(mob.client, JOB_SQUAD_LEADER, time_required_for_job)) leader = mob to_chat(mob, SPAN_ROLE_HEADER("You are an Officer in the Royal Marines Commando. Born in the Three World Empire.")) - arm_equipment(mob, /datum/equipment_preset/twe/royal_marine/team_leader, TRUE, TRUE) + arm_equipment(mob, /datum/equipment_preset/royal_marine/team_leader, TRUE, TRUE) else if(heavies < max_heavies && HAS_FLAG(mob.client.prefs.toggles_ert, PLAY_HEAVY) && check_timelock(mob.client, JOB_SQUAD_SPECIALIST)) var/specialist_kit = pick("Sniper", "Smartgun", "Breach") switch(specialist_kit) if("Sniper") to_chat(mob, SPAN_ROLE_HEADER("You are a skilled marksman in the Royal Marines Commando. Born in the Three World Empire.")) - arm_equipment(mob, /datum/equipment_preset/twe/royal_marine/spec/marksman, TRUE, TRUE) + arm_equipment(mob, /datum/equipment_preset/royal_marine/standard, TRUE, TRUE) if("Smartgun") to_chat(mob, SPAN_ROLE_HEADER("You are a Smartgunner in the Royal Marines Commando. Born in the Three World Empire.")) - arm_equipment(mob, /datum/equipment_preset/twe/royal_marine/spec/machinegun, TRUE, TRUE) + arm_equipment(mob, /datum/equipment_preset/royal_marine/machinegun, TRUE, TRUE) if("Breach") to_chat(mob, SPAN_ROLE_HEADER("You are a CQB Specialist in the Royal Marines Commando. Born in the Three World Empire.")) - arm_equipment(mob, /datum/equipment_preset/twe/royal_marine/spec/breacher, TRUE, TRUE) + arm_equipment(mob, /datum/equipment_preset/royal_marine/standard, TRUE, TRUE) heavies++ else to_chat(mob, SPAN_ROLE_HEADER("You are a member of the Royal Marines Commando. Born in the three world empire.")) - arm_equipment(mob, /datum/equipment_preset/twe/royal_marine/standard, TRUE, TRUE) + arm_equipment(mob, /datum/equipment_preset/royal_marine/standard, TRUE, TRUE) print_backstory(mob) diff --git a/code/datums/factions/pmc.dm b/code/datums/factions/pmc.dm index e1ec37872a4..83c508a5827 100644 --- a/code/datums/factions/pmc.dm +++ b/code/datums/factions/pmc.dm @@ -38,8 +38,7 @@ list("M41A extended magazine (10x24mm)", 5, /obj/item/ammo_magazine/rifle/extended, null, VENDOR_ITEM_REGULAR), list("M39 AP magazine (10x20mm)", 10, /obj/item/ammo_magazine/smg/m39/ap, null, VENDOR_ITEM_REGULAR), list("M39 HV extended magazine (10x20mm)", 5, /obj/item/ammo_magazine/smg/m39/extended, null, VENDOR_ITEM_REGULAR), - list("NSG 23 armor-piercing magazine (10x24mm)", 10, /obj/item/ammo_magazine/rifle/nsg23/ap, null, VENDOR_ITEM_REGULAR), - list("NSG 23 extended magazine (10x24mm)", 5, /obj/item/ammo_magazine/rifle/nsg23/extended, null, VENDOR_ITEM_REGULAR), + list("NSG L23A1 armor-piercing magazine (10x24mm)", 10, /obj/item/ammo_magazine/rifle/nsg23/ap, null, VENDOR_ITEM_REGULAR), list("SIDEARMS", 0, null, null, null), list("VP78 pistol", 20, /obj/item/weapon/gun/pistol/vp78, null, VENDOR_ITEM_REGULAR), @@ -78,8 +77,7 @@ list("M41A extended magazine (10x24mm)", 50, /obj/item/ammo_magazine/rifle/extended, null, VENDOR_ITEM_REGULAR), list("M39 AP magazine (10x20mm)", 30, /obj/item/ammo_magazine/smg/m39/ap, null, VENDOR_ITEM_REGULAR), list("M39 HV extended magazine (10x20mm)", 50, /obj/item/ammo_magazine/smg/m39/extended, null, VENDOR_ITEM_REGULAR), - list("NSG 23 armor-piercing magazine (10x24mm)", 30, /obj/item/ammo_magazine/rifle/nsg23/ap, null, VENDOR_ITEM_REGULAR), - list("NSG 23 extended magazine (10x24mm)", 50, /obj/item/ammo_magazine/rifle/nsg23/extended, null, VENDOR_ITEM_REGULAR), + list("NSG L23A1 armor-piercing magazine (10x24mm)", 30, /obj/item/ammo_magazine/rifle/nsg23/ap, null, VENDOR_ITEM_REGULAR), list("SIDEARMS", 0, null, null, null), list("VP78 pistol", 20, /obj/item/weapon/gun/pistol/vp78, null, VENDOR_ITEM_REGULAR), diff --git a/code/datums/origin/twe.dm b/code/datums/origin/twe.dm new file mode 100644 index 00000000000..8bb03bde771 --- /dev/null +++ b/code/datums/origin/twe.dm @@ -0,0 +1,3 @@ +/datum/origin/twe + name = ORIGIN_TWE + desc = "You were born in the Three World Empire." diff --git a/code/datums/paygrades/factions/twe/twe.dm b/code/datums/paygrades/factions/twe/twe.dm index 582030f9f80..87055cb9484 100644 --- a/code/datums/paygrades/factions/twe/twe.dm +++ b/code/datums/paygrades/factions/twe/twe.dm @@ -6,27 +6,33 @@ //RMC Emlisted /datum/paygrade/twe/e1 paygrade = PAY_SHORT_RMC1 - name = "Heitai-Marine" - prefix = "Hti-Mne." + name = "Marine" + prefix = "Mne." /datum/paygrade/twe/e2 paygrade = PAY_SHORT_RMC2 - name = "Santo-Lance Corporal" - prefix = "St-LCpl." + name = "Lance Corporal" + prefix = "LCpl." pay_multiplier = 2.1 /datum/paygrade/twe/e3 paygrade = PAY_SHORT_RMC3 - name = "Nito-Corporal" - prefix = "Nt-Cpl." + name = "Corporal" + prefix = "Cpl." pay_multiplier = 2.2 /datum/paygrade/twe/e4 paygrade = PAY_SHORT_RMC4 - name = "Itto-Sergeant" + name = "Sergeant" prefix = "Sgt." pay_multiplier = 2.3 +/datum/paygrade/twe/e5 + paygrade = PAY_SHORT_RMC5 + name = "Colour Sergeant" + prefix = "Clr-Sgt." + pay_multiplier = 2.4 + //TWE Warrent Officer /datum/paygrade/twe/wo1 paygrade = PAY_SHORT_RNOW diff --git a/code/game/jobs/job/special/weyland_yutani.dm b/code/game/jobs/job/special/weyland_yutani.dm index b343eb56112..da5e17234fd 100644 --- a/code/game/jobs/job/special/weyland_yutani.dm +++ b/code/game/jobs/job/special/weyland_yutani.dm @@ -55,11 +55,11 @@ /datum/job/special/wey_yu/pmc/standard title = JOB_PMC_STANDARD - gear_preset = /datum/equipment_preset/pmc/pmc_standard + gear_preset = /datum/equipment_preset/pmc/standard /datum/job/special/wey_yu/pmc/medic title = JOB_PMC_MEDIC - gear_preset = /datum/equipment_preset/pmc/pmc_medic + gear_preset = /datum/equipment_preset/pmc/medic /datum/job/special/wey_yu/pmc/engineer title = JOB_PMC_ENGINEER @@ -67,31 +67,31 @@ /datum/job/special/wey_yu/pmc/gunner title = JOB_PMC_GUNNER - gear_preset = /datum/equipment_preset/pmc/pmc_gunner + gear_preset = /datum/equipment_preset/pmc/gunner /datum/job/special/wey_yu/pmc/sniper title = JOB_PMC_SNIPER - gear_preset = /datum/equipment_preset/pmc/pmc_sniper + gear_preset = /datum/equipment_preset/pmc/sniper /datum/job/special/wey_yu/pmc/leader title = JOB_PMC_LEADER - gear_preset = /datum/equipment_preset/pmc/pmc_leader + gear_preset = /datum/equipment_preset/pmc/leader /datum/job/special/wey_yu/pmc/investigator title = JOB_PMC_INVESTIGATOR - gear_preset = /datum/equipment_preset/pmc/pmc_leader + gear_preset = /datum/equipment_preset/pmc/leader /datum/job/special/wey_yu/pmc/lead_invest title = JOB_PMC_LEAD_INVEST - gear_preset = /datum/equipment_preset/pmc/pmc_leader + gear_preset = /datum/equipment_preset/pmc/leader /datum/job/special/wey_yu/pmc/detainer title = JOB_PMC_DETAINER - gear_preset = /datum/equipment_preset/pmc/pmc_standard + gear_preset = /datum/equipment_preset/pmc/standard /datum/job/special/wey_yu/pmc/crewman title = JOB_PMC_CREWMAN - gear_preset = /datum/equipment_preset/pmc/pmc_crewman + gear_preset = /datum/equipment_preset/pmc/crewman /datum/job/special/wey_yu/pmc/doctor title = JOB_PMC_DOCTOR diff --git a/code/game/objects/effects/landmarks/survivor_spawner.dm b/code/game/objects/effects/landmarks/survivor_spawner.dm index 0b1fe192bc8..2047628055b 100644 --- a/code/game/objects/effects/landmarks/survivor_spawner.dm +++ b/code/game/objects/effects/landmarks/survivor_spawner.dm @@ -120,7 +120,7 @@ spawn_priority = SPAWN_PRIORITY_HIGH /obj/effect/landmark/survivor_spawner/bigred_crashed_pmc_medic - equipment = /datum/equipment_preset/pmc/pmc_medic + equipment = /datum/equipment_preset/pmc/medic synth_equipment = /datum/equipment_preset/synth/survivor/pmc intro_text = list("

You are a survivor of a crash landing!

",\ "You are NOT aware of the xenomorph threat.",\ @@ -133,7 +133,7 @@ spawn_priority = SPAWN_PRIORITY_VERY_HIGH /obj/effect/landmark/survivor_spawner/bigred_crashed_pmc_engineer - equipment = /datum/equipment_preset/pmc/pmc_standard + equipment = /datum/equipment_preset/pmc/standard synth_equipment = /datum/equipment_preset/synth/survivor/pmc intro_text = list("

You are a survivor of a crash landing!

",\ "You are NOT aware of the xenomorph threat.",\ diff --git a/code/game/objects/effects/spawners/faction_spawners.dm b/code/game/objects/effects/spawners/faction_spawners.dm index b020ab6c673..62c382a94d9 100644 --- a/code/game/objects/effects/spawners/faction_spawners.dm +++ b/code/game/objects/effects/spawners/faction_spawners.dm @@ -112,7 +112,7 @@ /obj/item/weapon/gun/smg/m39/elite = /obj/item/ammo_magazine/smg/m39/ap, /obj/item/weapon/gun/smg/m39/elite = /obj/item/ammo_magazine/smg/m39/extended, /obj/item/weapon/gun/rifle/nsg23 = /obj/item/ammo_magazine/rifle/nsg23/ap, - /obj/item/weapon/gun/rifle/nsg23 = /obj/item/ammo_magazine/rifle/nsg23/extended + /obj/item/weapon/gun/rifle/nsg23 = /obj/item/ammo_magazine/rifle/nsg23 ) /obj/effect/spawner/random/gun/pmc_primary/lowchance diff --git a/code/game/objects/effects/spawners/random.dm b/code/game/objects/effects/spawners/random.dm index 0951524e150..4a6cf0dad4d 100644 --- a/code/game/objects/effects/spawners/random.dm +++ b/code/game/objects/effects/spawners/random.dm @@ -434,7 +434,6 @@ /obj/item/weapon/gun/rifle/mar40 = /obj/item/ammo_magazine/rifle/mar40, /obj/item/weapon/gun/rifle/ar10 = /obj/item/ammo_magazine/rifle/ar10, /obj/item/weapon/gun/rifle/l42a/abr40 = /obj/item/ammo_magazine/rifle/l42a/abr40, - /obj/item/weapon/gun/rifle/nsg23/no_lock/stripped = /obj/item/ammo_magazine/rifle/nsg23 ) /obj/effect/spawner/random/gun/rifle/lowchance diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index ad6ff5cf672..79a2fdacaa5 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -685,7 +685,7 @@ /obj/item/device/radio/headset/almayer/marine/solardevils/upp/medic name = "UPP-MED headset" desc = "A special headset used by UPP military. Channels are as follows: #m - medical." - frequency = UPP_GRD_FREQ + frequency = UPP_FREQ initial_keys = list(/obj/item/device/encryptionkey/upp/medic) /obj/item/device/radio/headset/almayer/marine/solardevils/upp/command @@ -693,6 +693,15 @@ desc = "A special headset used by UPP military. Channels are as follows: :o - colony, #j - combat controller, #n - engineering, #m - medical, #v - command, #u - UPP general." initial_keys = list(/obj/item/device/encryptionkey/upp/command) +/obj/item/device/radio/headset/almayer/marine/solardevils/rmc + name = "TWE Royal Marine Commando headset" + desc = "A special headset used by the TWE's elite Royal Marine Commandos." + icon_state = "upp_headset" + item_state = "upp_headset" + frequency = RMC_FREQ + initial_keys = null + has_hud = FALSE + //############################## ALPHA ############################### /obj/item/device/radio/headset/almayer/marine/alpha name = "marine alpha radio headset" diff --git a/code/game/objects/items/stacks/sheets/sheet_types.dm b/code/game/objects/items/stacks/sheets/sheet_types.dm index 472fe46f39b..c8c6997ca1e 100644 --- a/code/game/objects/items/stacks/sheets/sheet_types.dm +++ b/code/game/objects/items/stacks/sheets/sheet_types.dm @@ -360,9 +360,8 @@ GLOBAL_LIST_INIT_TYPED(cardboard_recipes, /datum/stack_recipe, list ( \ null, \ new/datum/stack_recipe("empty magazine box (S&W .38)", /obj/item/ammo_box/magazine/snw/empty), \ null, \ - new/datum/stack_recipe("empty magazine box (NSG 23)", /obj/item/ammo_box/magazine/nsg23/empty), \ - new/datum/stack_recipe("empty magazine box (NSG 23 AP)", /obj/item/ammo_box/magazine/nsg23/ap/empty), \ - new/datum/stack_recipe("empty magazine box (NSG 23 EX)", /obj/item/ammo_box/magazine/nsg23/ex/empty), \ + new/datum/stack_recipe("empty magazine box (NSG L23A1)", /obj/item/ammo_box/magazine/nsg23/empty), \ + new/datum/stack_recipe("empty magazine box (NSG L23A1 AP)", /obj/item/ammo_box/magazine/nsg23/ap/empty), \ null, \ new/datum/stack_recipe("empty magazine box (Type71)", /obj/item/ammo_box/magazine/type71/empty), \ new/datum/stack_recipe("empty magazine box (Type71 AP)", /obj/item/ammo_box/magazine/type71/ap/empty), \ diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm index 65f2ca028e3..6e58f0457c9 100644 --- a/code/game/objects/items/storage/backpack.dm +++ b/code/game/objects/items/storage/backpack.dm @@ -1120,7 +1120,7 @@ GLOBAL_LIST_EMPTY_TYPED(radio_packs, /obj/item/storage/backpack/marine/satchel/r desc = "The heavy-carry pack of the RMC forces. Designed to lug the most amount of gear into the battlefield." icon_state = "backpack_large" item_state = "backpack_large" - max_storage_space = 27 + max_storage_space = 21 /obj/item/storage/backpack/rmc/medium name = "standard RMC backpack" @@ -1128,7 +1128,7 @@ GLOBAL_LIST_EMPTY_TYPED(radio_packs, /obj/item/storage/backpack/marine/satchel/r icon_state = "backpack_medium" item_state = "backpack_medium" worn_accessible = TRUE - max_storage_space = 24 + max_storage_space = 18 /obj/item/storage/backpack/rmc/light name = "lightweight RMC backpack" @@ -1136,7 +1136,7 @@ GLOBAL_LIST_EMPTY_TYPED(radio_packs, /obj/item/storage/backpack/marine/satchel/r icon_state = "backpack_small" item_state = "backpack_small" worn_accessible = TRUE - max_storage_space = 21 + max_storage_space = 15 /obj/item/storage/backpack/rmc/frame //One sorry sod should have to lug this about spawns in their shuttle currently name = "\improper RMC carry-frame" @@ -1163,7 +1163,7 @@ GLOBAL_LIST_EMPTY_TYPED(radio_packs, /obj/item/storage/backpack/marine/satchel/r icon_state = "rmc_general" item_state = "rmc_general" has_gamemode_skin = FALSE - max_storage_space = 15 + max_storage_space = 10 //----------USASF & ARMY SECTION---------- diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm index 2a9b287ded1..d1253233d2c 100644 --- a/code/game/objects/items/storage/belt.dm +++ b/code/game/objects/items/storage/belt.dm @@ -2162,13 +2162,9 @@ flags_atom = NO_NAME_OVERRIDE|NO_SNOW_TYPE has_gamemode_skin = FALSE -/obj/item/storage/belt/marine/rmc/rmc_f90_ammo/fill_preset_inventory() +/obj/item/storage/belt/marine/rmc/rmc_nsg_ammo/fill_preset_inventory() for(var/i in 1 to storage_slots) - new /obj/item/ammo_magazine/rifle/rmc_f90(src) - -/obj/item/storage/belt/marine/rmc/rmc_f90_ammo/marksman/fill_preset_inventory() - for(var/i in 1 to storage_slots) - new /obj/item/ammo_magazine/rifle/rmc_f90/marksman(src) + new /obj/item/ammo_magazine/rifle/nsg23(src) /obj/item/storage/belt/medical/rmc name = "\improper L75 pattern medical storage rig" diff --git a/code/game/objects/items/storage/pouch.dm b/code/game/objects/items/storage/pouch.dm index 81a51cc5888..03b28f353a3 100644 --- a/code/game/objects/items/storage/pouch.dm +++ b/code/game/objects/items/storage/pouch.dm @@ -494,7 +494,7 @@ /obj/item/storage/pouch/magazine/large/nsg_ext/fill_preset_inventory() for(var/i = 1 to storage_slots) - new /obj/item/ammo_magazine/rifle/nsg23/extended(src) + new /obj/item/ammo_magazine/rifle/nsg23(src) /obj/item/storage/pouch/magazine/large/nsg_heap/fill_preset_inventory() for(var/i = 1 to storage_slots) diff --git a/code/modules/clothing/head/head.dm b/code/modules/clothing/head/head.dm index 8a7a35df6b4..10a34bc9053 100644 --- a/code/modules/clothing/head/head.dm +++ b/code/modules/clothing/head/head.dm @@ -835,7 +835,7 @@ /obj/item/clothing/head/beret/royal_marine name = "royal marine beret" - desc = "A green beret belonging to the royal marines commando. This beret symbolizes a royal marines ability to fight in any environment, desert, sea, artic or space a royal marine will always be ready." + desc = "A green beret worn by the TWE's Royal Marine Commandos. Wear it with pride." icon_state = "rmc_beret" item_state = "rmc_beret" icon = 'icons/obj/items/clothing/cm_hats.dmi' @@ -843,7 +843,3 @@ item_icons = list( WEAR_HEAD = 'icons/mob/humans/onmob/head_1.dmi' ) - -/obj/item/clothing/head/beret/royal_marine/team_leader - icon_state = "rmc_beret_tl" - item_state = "rmc_beret_tl" diff --git a/code/modules/clothing/suits/marine_armor/ert.dm b/code/modules/clothing/suits/marine_armor/ert.dm index eb70e30aa69..e3a9fc97f81 100644 --- a/code/modules/clothing/suits/marine_armor/ert.dm +++ b/code/modules/clothing/suits/marine_armor/ert.dm @@ -758,28 +758,32 @@ /obj/item/device/walkman, ) -/obj/item/clothing/suit/storage/marine/veteran/royal_marine/light //RMC Rifleman Armor +/obj/item/clothing/suit/marine/veteran/royal_marine/light //RMC Rifleman Armor icon_state = "rmc_light" item_state = "rmc_light" - armor_bullet = CLOTHING_ARMOR_MEDIUMHIGH - armor_energy = CLOTHING_ARMOR_MEDIUMLOW - armor_bomb = CLOTHING_ARMOR_MEDIUM - armor_rad = CLOTHING_ARMOR_MEDIUM - slowdown = SLOWDOWN_ARMOR_LIGHT + flags_atom = NO_NAME_OVERRIDE|NO_SNOW_TYPE + armor_melee = CLOTHING_ARMOR_MEDIUM + armor_bullet = CLOTHING_ARMOR_MEDIUM + armor_laser = CLOTHING_ARMOR_MEDIUMLOW + armor_energy = CLOTHING_ARMOR_NONE + armor_bomb = CLOTHING_ARMOR_MEDIUMLOW + armor_bio = CLOTHING_ARMOR_MEDIUM + armor_rad = CLOTHING_ARMOR_MEDIUMLOW -/obj/item/clothing/suit/storage/marine/veteran/royal_marine/light/team_leader //RMC TL & LT Armor +/obj/item/clothing/suit/marine/veteran/royal_marine/light/team_leader //RMC TL & LT Armor name = "kestrel armoured carry vest" icon_state = "rmc_light_padded" item_state = "rmc_light_padded" - storage_slots = 7 + flags_atom = NO_NAME_OVERRIDE|NO_SNOW_TYPE -/obj/item/clothing/suit/storage/marine/veteran/royal_marine/smartgun //Smartgun Spec Armor +/obj/item/clothing/suit/marine/veteran/royal_marine/smartgun //Smartgun Spec Armor name = "kestrel armoured smartgun harness" icon_state = "rmc_smartgun" item_state = "rmc_smartgun" + flags_atom = NO_NAME_OVERRIDE|NO_SNOW_TYPE flags_inventory = BLOCKSHARPOBJ|BLOCK_KNOCKDOWN|SMARTGUN_HARNESS -/obj/item/clothing/suit/storage/marine/veteran/royal_marine/pointman //Pointman Spec Armor +/obj/item/clothing/suit/marine/veteran/royal_marine/pointman //Pointman Spec Armor name = "kestrel pointman armour" desc = "A heavier version of the armor system used by the Three World Empire's Royal Marines Commandos. Designers from a Weyland Yutani subsidary, Lindenthal-Ehrenfeld Militärindustrie, iterated on the USCMC's M3 pattern personal armor in their Tokonigara lab to create an armor systemed to suit the unique needs of the Three World Empire's smaller but better equipped Royal Marines." icon_state = "rmc_pointman" @@ -790,7 +794,6 @@ armor_bio = CLOTHING_ARMOR_MEDIUM armor_rad = CLOTHING_ARMOR_MEDIUM armor_internaldamage = CLOTHING_ARMOR_MEDIUMHIGH - storage_slots = 7 slowdown = SLOWDOWN_ARMOR_LOWHEAVY movement_compensation = SLOWDOWN_ARMOR_MEDIUM diff --git a/code/modules/clothing/under/marine_uniform.dm b/code/modules/clothing/under/marine_uniform.dm index 84295b65ea8..4d5badb9876 100644 --- a/code/modules/clothing/under/marine_uniform.dm +++ b/code/modules/clothing/under/marine_uniform.dm @@ -446,8 +446,8 @@ /obj/item/clothing/under/marine/veteran/marsoc name = "black uniform" - desc = "Black BDU utilized by USCM forces on night operations." - flags_jumpsuit = UNIFORM_SLEEVE_ROLLABLE + desc = "Non-standard black battle dress uniform, with venlar armor inserts at critical areas to protect from blades and ballistics." + flags_jumpsuit = UNIFORM_SLEEVE_ROLLABLE|UNIFORM_JACKET_REMOVABLE icon_state = "marsoc_jumpsuit" worn_state = "marsoc_jumpsuit" flags_item = NO_SNOW_TYPE diff --git a/code/modules/cm_marines/equipment/guncases.dm b/code/modules/cm_marines/equipment/guncases.dm index 41f65ff7cff..e3d02aabe21 100644 --- a/code/modules/cm_marines/equipment/guncases.dm +++ b/code/modules/cm_marines/equipment/guncases.dm @@ -622,14 +622,14 @@ /obj/item/storage/box/guncase/nsg23_marine name = "\improper NSG-23 assault rifle case" - desc = "A gun case containing a NSG 23 assault rifle. While usually seen in the hands of PMCs, this weapon is sometimes issued to USCM personnel." + desc = "A gun case containing a NSG L23A1 assault rifle. While usually seen in the hands of PMCs, this weapon is sometimes issued to USCM personnel." storage_slots = 6 - can_hold = list(/obj/item/weapon/gun/rifle/nsg23/no_lock, /obj/item/ammo_magazine/rifle/nsg23) + can_hold = /obj/item/ammo_magazine/rifle/nsg23 /obj/item/storage/box/guncase/nsg23_marine/fill_preset_inventory() - new /obj/item/weapon/gun/rifle/nsg23/no_lock(src) + new /obj/item/weapon/gun/rifle/nsg23(src) new /obj/item/ammo_magazine/rifle/nsg23/ap(src) - new /obj/item/ammo_magazine/rifle/nsg23/extended(src) + new /obj/item/ammo_magazine/rifle/nsg23(src) new /obj/item/ammo_magazine/rifle/nsg23(src) new /obj/item/ammo_magazine/rifle/nsg23(src) new /obj/item/ammo_magazine/rifle/nsg23(src) diff --git a/code/modules/gear_presets/_select_equipment.dm b/code/modules/gear_presets/_select_equipment.dm index 146f1aa53a7..f8520e38289 100644 --- a/code/modules/gear_presets/_select_equipment.dm +++ b/code/modules/gear_presets/_select_equipment.dm @@ -1088,7 +1088,7 @@ GLOBAL_LIST_INIT(rebel_rifles, list( new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/shotgun/pump/dual_tube/cmb(new_human), WEAR_L_HAND) new_human.equip_to_slot_or_del(new /obj/item/storage/belt/marine/shotgun_ammo, WEAR_WAIST) if(3) - new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/nsg23/no_lock/stripped(new_human), WEAR_L_HAND) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/nsg23(new_human), WEAR_L_HAND) new_human.equip_to_slot_or_del(new /obj/item/storage/belt/marine/nsg23(new_human), WEAR_WAIST) if(4) new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/mar40/carbine(new_human), WEAR_L_HAND) @@ -1417,11 +1417,11 @@ GLOBAL_LIST_INIT(rebel_rifles, list( /datum/equipment_preset/proc/add_upp_uniform(mob/living/carbon/human/new_human) var/obj/item/clothing/under/marine/veteran/UPP/uniform = new() - var/random_uniform = rand(1,2) + var/random_uniform = rand(1,4) switch(random_uniform) if(1) uniform.roll_suit_jacket(new_human) - if(2) + if(2 to 3) uniform.roll_suit_sleeves(new_human) new_human.equip_to_slot_or_del(uniform, WEAR_BODY) new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/upp, WEAR_ACCESSORY) @@ -1435,21 +1435,21 @@ GLOBAL_LIST_INIT(rebel_rifles, list( /datum/equipment_preset/proc/add_uscm_uniform(mob/living/carbon/human/new_human) var/obj/item/clothing/under/marine/uniform = new() - var/random_uniform = rand(1,3) + var/random_uniform = rand(1,4) switch(random_uniform) if(1) uniform.roll_suit_jacket(new_human) - if(2) + if(2 to 3) uniform.roll_suit_sleeves(new_human) new_human.equip_to_slot_or_del(uniform, WEAR_BODY) /datum/equipment_preset/proc/add_uscm_uniform_standard(mob/living/carbon/human/new_human) var/obj/item/clothing/under/marine/standard/uniform = new() - var/random_uniform = rand(1,3) + var/random_uniform = rand(1,4) switch(random_uniform) if(1) uniform.roll_suit_jacket(new_human) - if(2) + if(2 to 3) uniform.roll_suit_sleeves(new_human) new_human.equip_to_slot_or_del(uniform, WEAR_BODY) @@ -1498,3 +1498,15 @@ GLOBAL_LIST_INIT(rebel_rifles, list( new_human.equip_to_slot_or_del(new /obj/item/storage/fancy/cigarettes/wypacket, WEAR_IN_HELMET) if(6) new_human.equip_to_slot_or_del(new /obj/item/storage/fancy/cigarettes/arcturian_ace, WEAR_IN_HELMET) + + +/datum/equipment_preset/proc/add_rmc_uniform(mob/living/carbon/human/new_human) + var/obj/item/clothing/under/marine/veteran/marsoc/uniform = new() + var/random_uniform = rand(1,4) + switch(random_uniform) + if(1) + uniform.roll_suit_jacket(new_human) + if(2 to 3) + uniform.roll_suit_sleeves(new_human) + new_human.equip_to_slot_or_del(uniform, WEAR_BODY) + diff --git a/code/modules/gear_presets/colonist.dm b/code/modules/gear_presets/colonist.dm index 273e7199f6b..ef2b013da30 100644 --- a/code/modules/gear_presets/colonist.dm +++ b/code/modules/gear_presets/colonist.dm @@ -1040,7 +1040,3 @@ name = "LatAm Colonial Guard" ethnicity = LATIN_AMERICAN_ETHNICITY languages = list(LANGUAGE_SPANISH) - -#undef AMERICAN_ETHNICITY -#undef LATIN_AMERICAN_ETHNICITY -#undef JAPANESE_ETHNICITY diff --git a/code/modules/gear_presets/corpses.dm b/code/modules/gear_presets/corpses.dm index cf7705bdf15..e871f49dae7 100644 --- a/code/modules/gear_presets/corpses.dm +++ b/code/modules/gear_presets/corpses.dm @@ -540,10 +540,10 @@ new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/pmc/royal_marine, WEAR_IN_ACCESSORY) new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/royal_marine, WEAR_IN_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/royal_marine/light, WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/marine/veteran/royal_marine/light, WEAR_JACKET) new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar/tactical, WEAR_IN_JACKET) new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/rmc_f90, WEAR_J_STORE) - new_human.equip_to_slot_or_del(new /obj/item/storage/belt/marine/rmc/rmc_f90_ammo, WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/marine/rmc/rmc_nsg_ammo, WEAR_WAIST) new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/rmc/light, WEAR_BACK) new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full/alternate, WEAR_L_STORE) diff --git a/code/modules/gear_presets/pmc.dm b/code/modules/gear_presets/pmc.dm index 2d787da3c5a..da134033f4d 100644 --- a/code/modules/gear_presets/pmc.dm +++ b/code/modules/gear_presets/pmc.dm @@ -49,7 +49,7 @@ //*****************************************************************************************************/ -/datum/equipment_preset/pmc/pmc_standard +/datum/equipment_preset/pmc/standard name = "Weyland-Yutani PMC (Standard)" flags = EQUIPMENT_PRESET_EXTRA assignment = JOB_PMC_STANDARD @@ -57,7 +57,7 @@ paygrades = list(PAY_SHORT_PMC_OP = JOB_PLAYTIME_TIER_0) skills = /datum/skills/pmc -/datum/equipment_preset/pmc/pmc_standard/load_gear(mob/living/carbon/human/new_human) +/datum/equipment_preset/pmc/standard/load_gear(mob/living/carbon/human/new_human) //back new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/black, WEAR_BACK) new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar/tactical, WEAR_IN_BACK) @@ -111,7 +111,7 @@ new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/m41aMK1, WEAR_IN_L_STORE) //*****************************************************************************************************/ -/datum/equipment_preset/pmc/pmc_medic +/datum/equipment_preset/pmc/medic name = "Weyland-Yutani PMC (Corporate Medic)" flags = EQUIPMENT_PRESET_EXTRA assignment = JOB_PMC_MEDIC @@ -119,7 +119,7 @@ paygrades = list(PAY_SHORT_PMC_MS = JOB_PLAYTIME_TIER_0) skills = /datum/skills/pmc/medic -/datum/equipment_preset/pmc/pmc_medic/load_gear(mob/living/carbon/human/new_human) +/datum/equipment_preset/pmc/medic/load_gear(mob/living/carbon/human/new_human) //back new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/black, WEAR_BACK) new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/adv, WEAR_IN_BACK) @@ -173,7 +173,7 @@ //*****************************************************************************************************/ -/datum/equipment_preset/pmc/pmc_leader +/datum/equipment_preset/pmc/leader name = "Weyland-Yutani PMC (Leader)" flags = EQUIPMENT_PRESET_EXTRA @@ -183,11 +183,11 @@ role_comm_title = "SL" skills = /datum/skills/pmc/SL -/datum/equipment_preset/pmc/pmc_leader/New() +/datum/equipment_preset/pmc/leader/New() . = ..() access = get_access(ACCESS_LIST_WY_PMC) + list(ACCESS_WY_LEADERSHIP, ACCESS_WY_PMC_TL) -/datum/equipment_preset/pmc/pmc_leader/load_gear(mob/living/carbon/human/new_human) +/datum/equipment_preset/pmc/leader/load_gear(mob/living/carbon/human/new_human) //back new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/black, WEAR_BACK) new_human.equip_to_slot_or_del(new /obj/item/explosive/grenade/high_explosive, WEAR_IN_BACK) @@ -243,7 +243,7 @@ //*****************************************************************************************************/ -/datum/equipment_preset/pmc/pmc_gunner +/datum/equipment_preset/pmc/gunner name = "Weyland-Yutani PMC (Gunner)" flags = EQUIPMENT_PRESET_EXTRA @@ -253,7 +253,7 @@ role_comm_title = "SG" skills = /datum/skills/pmc/smartgunner -/datum/equipment_preset/pmc/pmc_gunner/load_gear(mob/living/carbon/human/new_human) +/datum/equipment_preset/pmc/gunner/load_gear(mob/living/carbon/human/new_human) //TODO: add backpacks and satchels new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/pmc, WEAR_L_EAR) //face @@ -292,7 +292,7 @@ //*****************************************************************************************************/ -/datum/equipment_preset/pmc/pmc_sniper +/datum/equipment_preset/pmc/sniper name = "Weyland-Yutani PMC (Sniper)" flags = EQUIPMENT_PRESET_EXTRA @@ -302,7 +302,7 @@ role_comm_title = "Spc" skills = /datum/skills/pmc/specialist -/datum/equipment_preset/pmc/pmc_sniper/load_gear(mob/living/carbon/human/new_human) +/datum/equipment_preset/pmc/sniper/load_gear(mob/living/carbon/human/new_human) //back new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/satchel/black, WEAR_BACK) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smg/m39, WEAR_IN_BACK) @@ -347,7 +347,7 @@ new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/magazine/large/pmc_sniper, WEAR_L_STORE) new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full/alternate, WEAR_R_STORE) //*****************************************************************************************************/ -/datum/equipment_preset/pmc/pmc_crewman +/datum/equipment_preset/pmc/crewman name = "Weyland-Yutani PMC (Crewman)" flags = EQUIPMENT_PRESET_EXTRA assignment = JOB_PMC_CREWMAN @@ -355,7 +355,7 @@ paygrades = list(PAY_SHORT_PMC_VS = JOB_PLAYTIME_TIER_0) skills = /datum/skills/pmc/tank_crew -/datum/equipment_preset/pmc/pmc_crewman/load_gear(mob/living/carbon/human/new_human) +/datum/equipment_preset/pmc/crewman/load_gear(mob/living/carbon/human/new_human) new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/distress/pmc, WEAR_L_EAR) new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/rmc/knife, WEAR_FEET) new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/pmc, WEAR_BODY) diff --git a/code/modules/gear_presets/royal_marines.dm b/code/modules/gear_presets/royal_marines.dm index 6eea6308895..e522af172be 100644 --- a/code/modules/gear_presets/royal_marines.dm +++ b/code/modules/gear_presets/royal_marines.dm @@ -1,339 +1,239 @@ -/datum/equipment_preset/twe - name = "Three World Empire" +/datum/equipment_preset/royal_marine + name = FACTION_TWE faction = FACTION_TWE - faction_group = list(FACTION_TWE, FACTION_MARINE) - languages = list(LANGUAGE_ENGLISH, LANGUAGE_JAPANESE) - -/datum/equipment_preset/twe/royal_marine/load_name(mob/living/carbon/human/new_human, randomise) - new_human.gender = pick_weight(list(MALE = 80, FEMALE = 20,)) - var/datum/preferences/placeholder_pref = new() - placeholder_pref.randomize_appearance(new_human) - var/random_name - var/static/list/colors = list("BLACK" = list(15, 15, 25), "BROWN" = list(102, 51, 0), "AUBURN" = list(139, 62, 19)) - var/static/list/hair_colors = colors.Copy() + list("BLONDE" = list(197, 164, 30), "CARROT" = list(174, 69, 42)) - var/hair_color = pick(hair_colors) - new_human.r_hair = hair_colors[hair_color][1] - new_human.g_hair = hair_colors[hair_color][2] - new_human.b_hair = hair_colors[hair_color][3] - new_human.r_facial = hair_colors[hair_color][1] - new_human.g_facial = hair_colors[hair_color][2] - new_human.b_facial = hair_colors[hair_color][3] - var/eye_color = pick(colors) - new_human.r_eyes = colors[eye_color][1] - new_human.g_eyes = colors[eye_color][2] - new_human.b_eyes = colors[eye_color][3] - idtype = /obj/item/card/id/dogtag - if(new_human.gender == MALE) - random_name = "[pick(GLOB.first_names_male)] [pick(GLOB.last_names)]" - new_human.h_style = pick("Crewcut", "Shaved Head", "Buzzcut", "Undercut", "Side Undercut", "Pvt. Joker", "Marine Fade", "Low Fade", "Medium Fade", "High Fade", "No Fade", "Coffee House Cut", "Flat Top",) - new_human.f_style = pick("5 O'clock Shadow", "Shaved", "Full Beard", "3 O'clock Moustache", "5 O'clock Shadow", "5 O'clock Moustache", "7 O'clock Shadow", "7 O'clock Moustache",) - else - random_name = "[pick(GLOB.first_names_female)] [pick(GLOB.last_names)]" - new_human.h_style = pick("Ponytail 1", "Ponytail 2", "Ponytail 3", "Ponytail 4", "Pvt. Redding", "Pvt. Clarison", "Cpl. Dietrich", "Pvt. Vasquez", "Marine Bun", "Marine Bun 2", "Marine Flat Top",) - new_human.change_real_name(new_human, random_name) - new_human.age = rand(20,45) - new_human.r_hair = rand(15,35) - new_human.g_hair = rand(15,35) - new_human.b_hair = rand(25,45) - -/datum/equipment_preset/twe/royal_marine/load_id(mob/living/carbon/human/new_human, client/mob_client) - if(human_versus_human) - var/obj/item/clothing/under/uniform = new_human.w_uniform - if(istype(uniform)) - uniform.has_sensor = UNIFORM_HAS_SENSORS - uniform.sensor_faction = FACTION_TWE - return ..() - -//*****************************************************************************************************/ - -/datum/equipment_preset/twe/royal_marine - name = "Royal Marines Commando" - assignment = "Royal Marine" - rank = JOB_TWE_RMC_RIFLEMAN - var/human_versus_human = FALSE - ///Gives the Royal Marines their radios - var/headset_type = /obj/item/device/radio/headset/distress/royal_marine + faction_group = list(FACTION_TWE) + languages = list(LANGUAGE_ENGLISH) + flags = EQUIPMENT_PRESET_EXTRA + origin_override = ORIGIN_TWE idtype = /obj/item/card/id/dogtag //*****************************************************************************************************/ -/datum/equipment_preset/twe/royal_marine/standard - name = "TWE Royal Marine Commando (Rifleman)" +/datum/equipment_preset/royal_marine/standard + name = "TWE Royal Marine Commando, Rifleman" + flags = EQUIPMENT_PRESET_EXTRA paygrades = list(PAY_SHORT_RMC1 = JOB_PLAYTIME_TIER_0) + access = ACCESS_LIST_WY_PMC role_comm_title = "RMC" - flags = EQUIPMENT_PRESET_EXTRA - assignment = "Royal Marines Rifleman" + assignment = "Rifleman" rank = JOB_TWE_RMC_RIFLEMAN skills = /datum/skills/rmc -/datum/equipment_preset/twe/royal_marine/standard/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new headset_type, WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/royal_marine, WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/royal_marine, WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine, WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/rmc, WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health, WEAR_EYES) - new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/royal_marines, WEAR_ACCESSORY) - - new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/droppouch, WEAR_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/pmc/royal_marine, WEAR_IN_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/royal_marine, WEAR_IN_ACCESSORY) - - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/royal_marine/light, WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/device/binoculars/range, WEAR_IN_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge, WEAR_IN_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar/tactical, WEAR_IN_JACKET) - - new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/rmc_f90, WEAR_J_STORE) - - new_human.equip_to_slot_or_del(new /obj/item/storage/belt/marine/rmc/rmc_f90_ammo, WEAR_WAIST) - - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/rmc/light, WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular/response, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/adv, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/surgical, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/device/defibrillator/compact, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/tool/surgery/synthgraft, WEAR_IN_BACK) +/datum/equipment_preset/royal_marine/standard/load_gear(mob/living/carbon/human/new_human) + if(SSmapping.configs[GROUND_MAP].environment_traits[MAP_COLD]) + new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/rebreather/scarf, WEAR_FACE) + new_human.equip_to_slot_or_del(/obj/item/clothing/under/marine/veteran/marsoc, WEAR_BODY) + //back + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/rmc/heavy, WEAR_BACK) new_human.equip_to_slot_or_del(new /obj/item/storage/box/packet/rmc/incin, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/storage/box/packet/rmc/he, WEAR_IN_BACK) - + new_human.equip_to_slot_or_del(new /obj/item/storage/box/packet/rmc/he, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/tool/weldingtool(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/tool/wirecutters(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/tool/shovel/etool/folded(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/box/MRE(new_human), WEAR_IN_BACK) + //face + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/marine/solardevils/rmc, WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/device/overwatch_camera, WEAR_R_EAR) + //head + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/royal_marine, WEAR_HEAD) + //uniform + add_rmc_uniform(new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/smallpouch/upp, WEAR_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/pmc/royal_marine, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/device/binoculars/range/designator, WEAR_IN_ACCESSORY) + //jacket + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/marine/veteran/royal_marine/light/team_leader, WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/nsg23, WEAR_J_STORE) + //waist + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/marine/rmc/rmc_nsg_ammo, WEAR_WAIST) + //limbs + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine, WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/rmc/knife, WEAR_FEET) + //pockets new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full/alternate, WEAR_L_STORE) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full, WEAR_R_STORE) - -/datum/equipment_preset/twe/royal_marine/standard/mre_pack - name = "TWE Royal Marine Commando (MRE Rifleman)" + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/pistol/alt, WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/vp78, WEAR_IN_R_STORE) -/datum/equipment_preset/twe/royal_marine/standard/mre_pack/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/rmc/frame, WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/ammo_box/magazine/misc/mre, WEAR_IN_BACK) - ..() - -//*****************************************************************************************************/ -/datum/equipment_preset/twe/royal_marine/spec - paygrades = list(PAY_SHORT_RMC2 = JOB_PLAYTIME_TIER_0) - role_comm_title = "RMC SPC" +/datum/equipment_preset/royal_marine/medic + name = "TWE Royal Marine Commando, Medic" flags = EQUIPMENT_PRESET_EXTRA - skills = /datum/skills/rmc/specialist - -/datum/equipment_preset/twe/royal_marine/spec/marksman - name = "TWE Royal Marine Commando (Marksman)" - assignment = "Royal Marines Marksman" - rank = JOB_TWE_RMC_MARKSMAN - -/datum/equipment_preset/twe/royal_marine/spec/marksman/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new headset_type, WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/royal_marine, WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/royal_marine, WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine, WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/rmc, WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health, WEAR_EYES) - new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/royal_marines, WEAR_ACCESSORY) - - new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/droppouch, WEAR_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/royal_marine, WEAR_IN_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/pmc/royal_marine, WEAR_IN_ACCESSORY) - - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/royal_marine/light, WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/device/binoculars/range, WEAR_IN_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge, WEAR_IN_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar/tactical, WEAR_IN_JACKET) - - new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/rmc_f90/scope, WEAR_J_STORE) - - new_human.equip_to_slot_or_del(new /obj/item/storage/belt/marine/rmc/rmc_f90_ammo/marksman, WEAR_WAIST) + paygrades = list(PAY_SHORT_RMC2 = JOB_PLAYTIME_TIER_0) + access = ACCESS_LIST_WY_PMC + role_comm_title = "RMC MED" + assignment = "Medic" + rank = JOB_TWE_RMC_RIFLEMAN + skills = /datum/skills/rmc - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/rmc/light, WEAR_BACK) +/datum/equipment_preset/royal_marine/medic/load_gear(mob/living/carbon/human/new_human) + //back + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/rmc/heavy, WEAR_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/box/packet/rmc/incin, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/box/packet/rmc/he, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/box/packet/rmc/he, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/tool/weldingtool(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/tool/wirecutters(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/tool/shovel/etool/folded(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/box/MRE(new_human), WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular/response, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/adv, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/surgical, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/device/defibrillator/compact, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/tool/surgery/synthgraft, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/box/packet/rmc/incin, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/box/packet/rmc/he, WEAR_IN_BACK) - - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full/alternate, WEAR_L_STORE) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full, WEAR_R_STORE) - -//*****************************************************************************************************/ - -/datum/equipment_preset/twe/royal_marine/spec/breacher - name = "TWE Royal Marine Commando (Breacher)" - assignment = "Royal Marines Breacher" - rank = JOB_TWE_RMC_BREACHER - -/datum/equipment_preset/twe/royal_marine/spec/breacher/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new headset_type, WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/royal_marine/breacher, WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/royal_marine, WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine, WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/rmc, WEAR_FEET) + //face + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/marine/solardevils/rmc, WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/device/overwatch_camera, WEAR_R_EAR) new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health, WEAR_EYES) - new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/royal_marines, WEAR_ACCESSORY) - - new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/droppouch, WEAR_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/royal_marine, WEAR_IN_ACCESSORY) + //head + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/royal_marine, WEAR_HEAD) + //uniform + add_rmc_uniform(new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/smallpouch/upp, WEAR_ACCESSORY) new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/pmc/royal_marine, WEAR_IN_ACCESSORY) - - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/royal_marine/pointman, WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/device/binoculars/range, WEAR_IN_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge, WEAR_IN_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar/tactical, WEAR_IN_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/rmc_f90, WEAR_IN_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/rmc_f90, WEAR_IN_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/rmc_f90, WEAR_IN_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/rmc_f90, WEAR_IN_JACKET) - - new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/rmc_f90/shotgun, WEAR_J_STORE) - - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/general_belt/rmc, WEAR_WAIST) - new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular/response, WEAR_IN_BELT) - new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/adv, WEAR_IN_BELT) - new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/surgical, WEAR_IN_BELT) - new_human.equip_to_slot_or_del(new /obj/item/device/defibrillator/compact, WEAR_IN_BELT) - new_human.equip_to_slot_or_del(new /obj/item/tool/surgery/synthgraft, WEAR_IN_BELT) - - new_human.equip_to_slot_or_del(new /obj/item/weapon/shield/riot/ballistic, WEAR_BACK) - + new_human.equip_to_slot_or_del(new /obj/item/device/binoculars/range/designator, WEAR_IN_ACCESSORY) + //jacket + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/marine/veteran/royal_marine/light/team_leader, WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/nsg23, WEAR_J_STORE) + //waist + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/marine/rmc/rmc_nsg_ammo, WEAR_WAIST) + //limbs + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine, WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/rmc/knife, WEAR_FEET) + //pockets new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full/alternate, WEAR_L_STORE) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full, WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/pistol/alt, WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/vp78, WEAR_IN_R_STORE) //*****************************************************************************************************/ -/datum/equipment_preset/twe/royal_marine/spec/machinegun - name = "TWE Royal Marine Commando (Smartgunner)" +/datum/equipment_preset/royal_marine/machinegun + name = "TWE Royal Marine Commando, Smartgunner" + flags = EQUIPMENT_PRESET_EXTRA role_comm_title = "RMC SG" assignment = "Royal Marines Smartgunner" rank = JOB_TWE_RMC_SMARTGUNNER skills = /datum/skills/rmc/smartgun + access = ACCESS_LIST_WY_PMC -/datum/equipment_preset/twe/royal_marine/spec/machinegun/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new headset_type, WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/royal_marine, WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/royal_marine, WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine, WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/rmc, WEAR_FEET) - new_human.equip_to_slot(new /obj/item/clothing/glasses/night/m56_goggles, WEAR_EYES) - new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/royal_marines, WEAR_ACCESSORY) - - new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/droppouch, WEAR_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/pmc/royal_marine, WEAR_IN_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/royal_marine, WEAR_IN_ACCESSORY) - - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/royal_marine/smartgun, WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/device/binoculars/range, WEAR_IN_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge, WEAR_IN_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar/tactical, WEAR_IN_JACKET) - - new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smartgun/rmc, WEAR_J_STORE) - - new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/l905/full, WEAR_WAIST) - +/datum/equipment_preset/royal_marine/machinegun/load_gear(mob/living/carbon/human/new_human) + //back new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/rmc/light, WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular/response, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/adv, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/surgical, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/device/defibrillator/compact, WEAR_IN_BACK) new_human.equip_to_slot(new /obj/item/smartgun_battery(new_human), WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smartgun/holo_targetting, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/smartgun/holo_targetting, WEAR_IN_BACK) - + new_human.equip_to_slot_or_del(new /obj/item/tool/weldingtool(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/tool/wirecutters(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/tool/shovel/etool/folded(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/box/MRE(new_human), WEAR_IN_BACK) + //face + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/marine/solardevils/rmc, WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/device/overwatch_camera, WEAR_R_EAR) + new_human.equip_to_slot(new /obj/item/clothing/glasses/night/m56_goggles, WEAR_EYES) + //head + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/royal_marine, WEAR_HEAD) + //uniform + add_rmc_uniform(new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/smallpouch/upp, WEAR_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/pmc/royal_marine, WEAR_IN_ACCESSORY) + //jacket + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/marine/veteran/royal_marine/smartgun, WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/smartgun/rmc, WEAR_J_STORE) + //waist + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/l905/full, WEAR_WAIST) + //limbs + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine, WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/rmc/knife, WEAR_FEET) + //pockets new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full/alternate, WEAR_L_STORE) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full, WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/pistol/alt, WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/vp78, WEAR_IN_R_STORE) //*****************************************************************************************************/ -/datum/equipment_preset/twe/royal_marine/team_leader - name = "TWE Royal Marine Commando (Teamleader)" +/datum/equipment_preset/royal_marine/team_leader + name = "TWE Royal Marine Commando, Team Leader" + flags = EQUIPMENT_PRESET_EXTRA paygrades = list(PAY_SHORT_RMC4 = JOB_PLAYTIME_TIER_0) role_comm_title = "RMC TL" - flags = EQUIPMENT_PRESET_EXTRA assignment = "Royal Marines Team Leader" rank = JOB_TWE_RMC_TEAMLEADER skills = /datum/skills/rmc/leader + access = ACCESS_LIST_WY_ALL -/datum/equipment_preset/twe/royal_marine/team_leader/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new headset_type, WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/royal_marine/team_leader, WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/royal_marine/tl, WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine, WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/rmc, WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health, WEAR_EYES) - new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/royal_marines, WEAR_ACCESSORY) - - new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/droppouch, WEAR_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/royal_marine, WEAR_IN_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/pmc/royal_marine, WEAR_IN_ACCESSORY) - - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/royal_marine/light/team_leader, WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/device/binoculars/range, WEAR_IN_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge, WEAR_IN_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar/tactical, WEAR_IN_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/rmc_f90, WEAR_IN_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/rmc_f90, WEAR_IN_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/rmc_f90, WEAR_IN_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/rmc_f90, WEAR_IN_JACKET) - - new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/rmc_f90/a_grip, WEAR_J_STORE) - - new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/l905/full, WEAR_WAIST) - - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/rmc/light, WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular/response, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/adv, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/surgical, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/device/defibrillator/compact, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/tool/surgery/synthgraft, WEAR_IN_BACK) +/datum/equipment_preset/royal_marine/team_leader/load_gear(mob/living/carbon/human/new_human) + //back + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/rmc/heavy, WEAR_BACK) new_human.equip_to_slot_or_del(new /obj/item/storage/box/packet/rmc/incin, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/storage/box/packet/rmc/he, WEAR_IN_BACK) - + new_human.equip_to_slot_or_del(new /obj/item/storage/box/packet/rmc/he, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/box/packet/smoke/green, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/tool/weldingtool(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/tool/wirecutters(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/tool/shovel/etool/folded(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/box/MRE(new_human), WEAR_IN_BACK) + //face + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/marine/solardevils/rmc, WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/device/overwatch_camera, WEAR_R_EAR) + //head + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/royal_marine, WEAR_HEAD) + //uniform + add_rmc_uniform(new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/smallpouch/upp, WEAR_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/pmc/royal_marine, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/device/binoculars/range/designator, WEAR_IN_ACCESSORY) + //jacket + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/marine/veteran/royal_marine/light/team_leader, WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/nsg23, WEAR_J_STORE) + //waist + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/marine/rmc/rmc_nsg_ammo, WEAR_WAIST) + //limbs + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine, WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/rmc/knife, WEAR_FEET) + //pockets new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full/alternate, WEAR_L_STORE) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full, WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/pistol/alt, WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/vp78, WEAR_IN_R_STORE) //*****************************************************************************************************/ -/datum/equipment_preset/twe/royal_marine/lieuteant //they better say it Lef-tenant or they should be banned for LRP. More importantly this guy doesn't spawn in the ERT - name = "TWE Royal Marine Commando (Officer)" +/datum/equipment_preset/royal_marine/lieuteant //they better say it Lef-tenant or they should be banned for LRP. More importantly this guy doesn't spawn in the ERT + name = "TWE Royal Marine Commando, Officer" + flags = EQUIPMENT_PRESET_EXTRA paygrades = list(PAY_SHORT_RNO1 = JOB_PLAYTIME_TIER_0) role_comm_title = "RMC LT" - flags = EQUIPMENT_PRESET_EXTRA - assignment = "Royal Marines Team Commander" + assignment = "Team Commander" rank = JOB_TWE_RMC_LIEUTENANT skills = /datum/skills/rmc/leader + access = ACCESS_LIST_WY_ALL -/datum/equipment_preset/twe/royal_marine/lieuteant/load_gear(mob/living/carbon/human/new_human) - new_human.equip_to_slot_or_del(new headset_type, WEAR_L_EAR) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/royal_marine/team_leader, WEAR_HEAD) - new_human.equip_to_slot_or_del(new /obj/item/clothing/under/marine/veteran/royal_marine/lt, WEAR_BODY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine, WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/rmc, WEAR_FEET) - new_human.equip_to_slot_or_del(new /obj/item/clothing/glasses/hud/health, WEAR_EYES) - new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/patch/royal_marines, WEAR_ACCESSORY) - - new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/droppouch, WEAR_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/marine/veteran/royal_marine, WEAR_IN_ACCESSORY) - new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/pmc/royal_marine, WEAR_IN_ACCESSORY) - - new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/storage/marine/veteran/royal_marine/light/team_leader, WEAR_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/device/binoculars/range, WEAR_IN_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge, WEAR_IN_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar/tactical, WEAR_IN_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/rmc_f90, WEAR_IN_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/rmc_f90, WEAR_IN_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/rmc_f90, WEAR_IN_JACKET) - new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/rmc_f90, WEAR_IN_JACKET) - - new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/rmc_f90/a_grip, WEAR_J_STORE) - - new_human.equip_to_slot_or_del(new /obj/item/storage/belt/gun/l905/full, WEAR_WAIST) - - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/rmc/light, WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular/response, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/adv, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/surgical, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/device/defibrillator/compact, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/tool/surgery/synthgraft, WEAR_IN_BACK) +/datum/equipment_preset/royal_marine/lieuteant/load_gear(mob/living/carbon/human/new_human) + //back + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/rmc/heavy, WEAR_BACK) new_human.equip_to_slot_or_del(new /obj/item/storage/box/packet/rmc/incin, WEAR_IN_BACK) new_human.equip_to_slot_or_del(new /obj/item/storage/box/packet/rmc/he, WEAR_IN_BACK) - + new_human.equip_to_slot_or_del(new /obj/item/storage/box/packet/rmc/he, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/box/packet/smoke/green, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/tool/weldingtool(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/tool/wirecutters(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/tool/shovel/etool/folded(new_human), WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/box/MRE(new_human), WEAR_IN_BACK) + //face + new_human.equip_to_slot_or_del(new /obj/item/device/radio/headset/almayer/marine/solardevils/rmc, WEAR_L_EAR) + new_human.equip_to_slot_or_del(new /obj/item/device/overwatch_camera, WEAR_R_EAR) + //head + new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/royal_marine, WEAR_HEAD) + //uniform + add_rmc_uniform(new_human) + new_human.equip_to_slot_or_del(new /obj/item/clothing/accessory/storage/smallpouch/upp, WEAR_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/pmc/royal_marine, WEAR_IN_ACCESSORY) + new_human.equip_to_slot_or_del(new /obj/item/device/binoculars/range/designator, WEAR_IN_ACCESSORY) + //jacket + new_human.equip_to_slot_or_del(new /obj/item/clothing/suit/marine/veteran/royal_marine/light/team_leader, WEAR_JACKET) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/nsg23, WEAR_J_STORE) + //waist + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/marine/rmc/rmc_nsg_ammo, WEAR_WAIST) + //limbs + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine, WEAR_HANDS) + new_human.equip_to_slot_or_del(new /obj/item/clothing/shoes/marine/rmc/knife, WEAR_FEET) + //pockets new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full/alternate, WEAR_L_STORE) - new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/firstaid/full, WEAR_R_STORE) - + new_human.equip_to_slot_or_del(new /obj/item/storage/pouch/pistol/alt, WEAR_R_STORE) + new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/pistol/vp78, WEAR_IN_R_STORE) diff --git a/code/modules/mob/living/carbon/human/ai/action_datums/sniper_nest.dm b/code/modules/mob/living/carbon/human/ai/action_datums/sniper_nest.dm index 7948a906b89..85d3bdeaa6a 100644 --- a/code/modules/mob/living/carbon/human/ai/action_datums/sniper_nest.dm +++ b/code/modules/mob/living/carbon/human/ai/action_datums/sniper_nest.dm @@ -74,7 +74,7 @@ var/static/list/sniper_equipment_presets = list( /datum/equipment_preset/clf/sniper::name = /datum/equipment_preset/clf/sniper, /datum/equipment_preset/clf/sniper/svd::name = /datum/equipment_preset/clf/sniper/svd, - /datum/equipment_preset/pmc/pmc_sniper::name = /datum/equipment_preset/pmc/pmc_sniper, + /datum/equipment_preset/pmc/sniper::name = /datum/equipment_preset/pmc/sniper, /datum/equipment_preset/upp/sniper::name = /datum/equipment_preset/upp/sniper, /datum/equipment_preset/uscm/specialist_equipped/sniper::name = /datum/equipment_preset/uscm/specialist_equipped/sniper, /datum/equipment_preset/other/freelancer/marksman::name = /datum/equipment_preset/other/freelancer/marksman, diff --git a/code/modules/mob/living/carbon/human/ai/squad_spawner/squad_army.dm b/code/modules/mob/living/carbon/human/ai/squad_spawner/squad_army.dm index 007461daf26..f34403771b6 100644 --- a/code/modules/mob/living/carbon/human/ai/squad_spawner/squad_army.dm +++ b/code/modules/mob/living/carbon/human/ai/squad_spawner/squad_army.dm @@ -1,5 +1,5 @@ /datum/human_ai_squad_preset/army - faction = FACTION_ARMY + faction = "United States Army" /datum/human_ai_squad_preset/army/patrol name = "Army Patrol Team" diff --git a/code/modules/mob/living/carbon/human/ai/squad_spawner/squad_pmc.dm b/code/modules/mob/living/carbon/human/ai/squad_spawner/squad_pmc.dm deleted file mode 100644 index d3b0ad173f6..00000000000 --- a/code/modules/mob/living/carbon/human/ai/squad_spawner/squad_pmc.dm +++ /dev/null @@ -1,33 +0,0 @@ -/datum/human_ai_squad_preset/pmc - faction = FACTION_PMC - -/datum/human_ai_squad_preset/pmc/rifleteam - name = "PMC Rifle Team" - desc = "A patrol group of 2 Standard PMCs." - ai_to_spawn = list( - /datum/equipment_preset/pmc/pmc_standard = 2, - ) - -/datum/human_ai_squad_preset/pmc/gunteam - name = "PMC, Gun Team" - desc = "A PMC squad, with support elements and a leader." - ai_to_spawn = list( - /datum/equipment_preset/pmc/pmc_standard = 1, - /datum/equipment_preset/pmc/pmc_gunner = 1, - ) - -/datum/human_ai_squad_preset/pmc/squad - name = "PMC, Squad" - desc = "A PMC squad, with support elements, a heavy smartgunner, and a leader. Use carefully." - ai_to_spawn = list( - /datum/equipment_preset/pmc/pmc_standard = 2, - /datum/equipment_preset/pmc/pmc_gunner = 1, - /datum/equipment_preset/pmc/pmc_leader = 1, - ) - -/datum/human_ai_squad_preset/pmc/medical - name = "PMC, Medical Element" - desc = "A PMC medical element with 2 medics." - ai_to_spawn = list( - /datum/equipment_preset/pmc/pmc_medic = 2, - ) diff --git a/code/modules/mob/living/carbon/human/ai/squad_spawner/squad_rmc.dm b/code/modules/mob/living/carbon/human/ai/squad_spawner/squad_rmc.dm new file mode 100644 index 00000000000..5075636b1ad --- /dev/null +++ b/code/modules/mob/living/carbon/human/ai/squad_spawner/squad_rmc.dm @@ -0,0 +1,34 @@ +/datum/human_ai_squad_preset/twe + faction = "Royal Marine Commandos" + +/datum/human_ai_squad_preset/twe/rifleteam + name = "TWE, Rifle Team" + desc = "TWE patrol armed with NSG L23A1 rifles and carrying IFAKs containing gauze, ointment, splints and an injector." + ai_to_spawn = list( + /datum/equipment_preset/royal_marine/team_leader = 1, + /datum/equipment_preset/royal_marine/standard = 1, + ) + +/datum/human_ai_squad_preset/twe/gunteam + name = "TWE, Gun Team" + desc = "TWE patrol armed with a NSG L23A1 rifle and an L56A2 smartgun, and carrying IFAKs containing gauze, ointment, splints and an injector." + ai_to_spawn = list( + /datum/equipment_preset/royal_marine/machinegun = 1, + /datum/equipment_preset/royal_marine/standard = 1, + ) + +/datum/human_ai_squad_preset/twe/squad + name = "TWE, Squad" + desc = "TWE patrol armed with 3 NSG L23A1 rifles and an M56A2 smartgun, and carrying IFAKs containing gauze, ointment, splints and an injector." + ai_to_spawn = list( + /datum/equipment_preset/royal_marine/team_leader = 1, + /datum/equipment_preset/royal_marine/standard = 2, + /datum/equipment_preset/royal_marine/machinegun = 1, + ) + +/datum/human_ai_squad_preset/twe/medical + name = "TWE, Medical Element" + desc = "TWE team armed with NSG L23A1 rifles and carrying ample medical supplies." + ai_to_spawn = list( + /datum/equipment_preset/royal_marine/medic = 2, + ) diff --git a/code/modules/mob/living/carbon/human/ai/squad_spawner/squad_upp.dm b/code/modules/mob/living/carbon/human/ai/squad_spawner/squad_upp.dm index d1f49fb5805..dbb327a11ca 100644 --- a/code/modules/mob/living/carbon/human/ai/squad_spawner/squad_upp.dm +++ b/code/modules/mob/living/carbon/human/ai/squad_spawner/squad_upp.dm @@ -1,5 +1,5 @@ /datum/human_ai_squad_preset/upp - faction = FACTION_UPP + faction = "Union of Progressive Peoples Armed Collective" /datum/human_ai_squad_preset/upp/militia name = "Territorial Guard, Patrol" diff --git a/code/modules/mob/living/carbon/human/ai/squad_spawner/squad_uscm.dm b/code/modules/mob/living/carbon/human/ai/squad_spawner/squad_uscm.dm index 806bc89e49d..f75e58822cc 100644 --- a/code/modules/mob/living/carbon/human/ai/squad_spawner/squad_uscm.dm +++ b/code/modules/mob/living/carbon/human/ai/squad_spawner/squad_uscm.dm @@ -1,6 +1,6 @@ /datum/human_ai_squad_preset/uscm - faction = FACTION_MARINE + faction = "United States Colonial Marines" /datum/human_ai_squad_preset/uscm/uacg name = "UACG, Patrol" @@ -13,25 +13,25 @@ name = "USCM, Rifle Team" desc = "USCM patrol armed with M41A rifles and carrying IFAKs containing gauze, ointment, splints and an injector." ai_to_spawn = list( - /datum/equipment_preset/uscm/private_equipped = 1, /datum/equipment_preset/uscm/tl_equipped = 1, + /datum/equipment_preset/uscm/private_equipped = 1, ) /datum/human_ai_squad_preset/uscm/gunteam name = "USCM, Gun Team" desc = "USCM patrol armed with a M41A rifle and an M56A2 smartgun, and carrying IFAKs containing gauze, ointment, splints and an injector." ai_to_spawn = list( - /datum/equipment_preset/uscm/private_equipped = 1, /datum/equipment_preset/uscm/smartgunner_equipped = 1, + /datum/equipment_preset/uscm/private_equipped = 1, ) /datum/human_ai_squad_preset/uscm/squad name = "USCM, Squad" desc = "USCM patrol armed with 3 M41A rifle and an M56A2 smartgun, and carrying IFAKs containing gauze, ointment, splints and an injector." ai_to_spawn = list( + /datum/equipment_preset/uscm/tl_equipped = 1, /datum/equipment_preset/uscm/private_equipped = 2, /datum/equipment_preset/uscm/smartgunner_equipped = 1, - /datum/equipment_preset/uscm/tl_equipped = 1, ) /datum/human_ai_squad_preset/uscm/medical @@ -45,8 +45,8 @@ name = "USCM, Command Element" desc = "Best utilized as defended objective, PltCo is not armed effectively." ai_to_spawn = list( + /datum/equipment_preset/uscm_ship/so_equipped = 1, /datum/equipment_preset/uscm/private_equipped = 2, /datum/equipment_preset/uscm/leader_equipped = 1, - /datum/equipment_preset/uscm_ship/so_equipped = 1, ) diff --git a/code/modules/mob/living/carbon/human/ai/squad_spawner/squad_wy.dm b/code/modules/mob/living/carbon/human/ai/squad_spawner/squad_wy.dm index 7e7260ddafe..8fe686385a4 100644 --- a/code/modules/mob/living/carbon/human/ai/squad_spawner/squad_wy.dm +++ b/code/modules/mob/living/carbon/human/ai/squad_spawner/squad_wy.dm @@ -1,5 +1,5 @@ /datum/human_ai_squad_preset/wy - faction = FACTION_WY + faction = "Weyland-Yutani Security" /datum/human_ai_squad_preset/wy/patrol name = "W-Y Security, Patrol Team" @@ -19,6 +19,37 @@ name = "W-Y Security, Tactical Squad" desc = "A squad comprised of 2 corporate tactical response officers armed with M39s and 1 corporate tactical response officer armed with a HG-37 loaded with slugs." ai_to_spawn = list( - /datum/equipment_preset/colonist/security/weyland/tactical = 2, /datum/equipment_preset/colonist/security/weyland/tactical/lead = 1, + /datum/equipment_preset/colonist/security/weyland/tactical = 2, + ) + +/datum/human_ai_squad_preset/wy/rifleteam + name = "PMC Rifle Team" + desc = "A patrol group of 2 Standard PMCs." + ai_to_spawn = list( + /datum/equipment_preset/pmc/standard = 2, + ) + +/datum/human_ai_squad_preset/wy/gunteam + name = "PMC, Gun Team" + desc = "A PMC squad, with support elements and a leader." + ai_to_spawn = list( + /datum/equipment_preset/pmc/gunner = 1, + /datum/equipment_preset/pmc/standard = 1, + ) + +/datum/human_ai_squad_preset/wy/squad + name = "PMC, Squad" + desc = "A PMC squad, with support elements, a heavy smartgunner, and a leader. Use carefully." + ai_to_spawn = list( + /datum/equipment_preset/pmc/leader = 1, + /datum/equipment_preset/pmc/standard = 2, + /datum/equipment_preset/pmc/gunner = 1, + ) + +/datum/human_ai_squad_preset/wy/medical + name = "PMC, Medical Element" + desc = "A PMC medical element with 2 medics." + ai_to_spawn = list( + /datum/equipment_preset/pmc/medic = 2, ) diff --git a/code/modules/projectiles/ammo_boxes/magazine_boxes.dm b/code/modules/projectiles/ammo_boxes/magazine_boxes.dm index 711abd3d059..350aca701fa 100644 --- a/code/modules/projectiles/ammo_boxes/magazine_boxes.dm +++ b/code/modules/projectiles/ammo_boxes/magazine_boxes.dm @@ -734,7 +734,7 @@ //-----------------------NSG 23 Rifle Mag Boxes----------------------- /obj/item/ammo_box/magazine/nsg23 - name = "magazine box (NSG 23 x 16)" + name = "magazine box (NSG L23A1 x 16)" flags_equip_slot = SLOT_BACK icon_state = "base_nsg23" overlay_gun_type = "_nsg23" @@ -746,7 +746,7 @@ empty = TRUE /obj/item/ammo_box/magazine/nsg23/ap - name = "magazine box (NSG 23 AP x 12)" + name = "magazine box (NSG L23A1 AP x 12)" overlay_ammo_type = "_ap" overlay_content = "_ap" magazine_type = /obj/item/ammo_magazine/rifle/nsg23/ap @@ -755,17 +755,8 @@ /obj/item/ammo_box/magazine/nsg23/ap/empty empty = TRUE -/obj/item/ammo_box/magazine/nsg23/ex - name = "magazine box (NSG 23 Extended x 8)" - overlay_ammo_type = "_ext" - magazine_type = /obj/item/ammo_magazine/rifle/nsg23/extended - num_of_magazines = 8 - -/obj/item/ammo_box/magazine/nsg23/ex/empty - empty = TRUE - /obj/item/ammo_box/magazine/nsg23/heap - name = "magazine box (NSG 23 HEAP x 16)" + name = "magazine box (NSG L23A1 HEAP x 16)" overlay_ammo_type = "_heap" overlay_content = "_heap" magazine_type = /obj/item/ammo_magazine/rifle/nsg23/heap diff --git a/code/modules/projectiles/gun_attachables.dm b/code/modules/projectiles/gun_attachables.dm index 686d3566a99..727fe292c65 100644 --- a/code/modules/projectiles/gun_attachables.dm +++ b/code/modules/projectiles/gun_attachables.dm @@ -2783,7 +2783,7 @@ Defined in conflicts.dm of the #defines folder. R.flags_equip_slot |= SLOT_WAIST /obj/item/attachable/stock/nsg23 - name = "NSG 23 stock" + name = "NSG L23A1 stock" desc = "If you can read this, someone screwed up. Go Github this and bug a coder." icon_state = "nsg23_stock" slot = "stock" @@ -2877,7 +2877,7 @@ Defined in conflicts.dm of the #defines folder. name = "U1 grenade launcher" desc = "A weapon-mounted, reloadable grenade launcher." icon_state = "grenade" - attach_icon = "grenade" + attach_icon = "grenade_a" w_class = SIZE_MEDIUM current_rounds = 0 max_rounds = 3 diff --git a/code/modules/projectiles/guns/rifles.dm b/code/modules/projectiles/guns/rifles.dm index 32c25a6c250..020acca72a9 100644 --- a/code/modules/projectiles/guns/rifles.dm +++ b/code/modules/projectiles/guns/rifles.dm @@ -110,8 +110,8 @@ //NSG 23 ASSAULT RIFLE - PMC PRIMARY RIFLE /obj/item/weapon/gun/rifle/nsg23 - name = "\improper NSG 23 assault rifle" - desc = "A rare sight, this rifle is seen most commonly in the hands of Weyland-Yutani PMCs. Compared to the M41A MK2, it has noticeably improved handling and vastly improved performance at long and medium range, but compares similarly up close." + name = "\improper NSG L23A1 pulse rifle" + desc = "Pulse action 10x24mm caseless assault rifle of the Royal Marine Commandos, personal friend of any Marine. Features a an integrated 30mm grenade launcher and ammo tube that can hold four grenades on backup." icon = 'icons/obj/items/weapons/guns/guns_by_faction/wy.dmi' icon_state = "nsg23" item_state = "nsg23" @@ -121,42 +121,32 @@ cocked_sound = 'sound/weapons/handling/nsg23_cocked.ogg' aim_slowdown = SLOWDOWN_ADS_QUICK wield_delay = WIELD_DELAY_VERY_FAST + flags_gun_features = GUN_AUTO_EJECTOR|GUN_CAN_POINTBLANK|GUN_AMMO_COUNTER current_mag = /obj/item/ammo_magazine/rifle/nsg23 attachable_allowed = list( /obj/item/attachable/suppressor, - /obj/item/attachable/bayonet, + /obj/item/attachable/bayonet/rmc, /obj/item/attachable/reddot, /obj/item/attachable/reflex, /obj/item/attachable/flashlight, - /obj/item/attachable/bipod, - /obj/item/attachable/extended_barrel, /obj/item/attachable/stock/nsg23, - /obj/item/attachable/attached_gun/flamer, - /obj/item/attachable/attached_gun/flamer/advanced, - /obj/item/attachable/attached_gun/grenade, - /obj/item/attachable/scope/mini/nsg23, + /obj/item/attachable/scope/mini, ) - flags_gun_features = GUN_AUTO_EJECTOR|GUN_CAN_POINTBLANK|GUN_AMMO_COUNTER - starting_attachment_types = list( - /obj/item/attachable/scope/mini/nsg23, + /obj/item/attachable/scope/mini, + /obj/item/attachable/attached_gun/grenade/mk1, + /obj/item/attachable/stock/nsg23, ) - start_semiauto = FALSE - start_automatic = TRUE - -/obj/item/weapon/gun/rifle/nsg23/Initialize(mapload, spawn_empty) - . = ..() - update_icon() /obj/item/weapon/gun/rifle/nsg23/set_gun_attachment_offsets() - attachable_offset = list("muzzle_x" = 32, "muzzle_y" = 16,"rail_x" = 13, "rail_y" = 22, "under_x" = 21, "under_y" = 10, "stock_x" = 5, "stock_y" = 17) + attachable_offset = list("muzzle_x" = 32, "muzzle_y" = 16,"rail_x" = 13, "rail_y" = 20, "under_x" = 19, "under_y" = 11, "stock_x" = 5, "stock_y" = 17) /obj/item/weapon/gun/rifle/nsg23/set_gun_config_values() ..() - set_fire_delay(FIRE_DELAY_TIER_7) + set_fire_delay(FIRE_DELAY_TIER_10) set_burst_amount(BURST_AMOUNT_TIER_3) - set_burst_delay(FIRE_DELAY_TIER_9) + set_burst_delay(FIRE_DELAY_TIER_11) accuracy_mult = BASE_ACCURACY_MULT + HIT_ACCURACY_MULT_TIER_10 accuracy_mult_unwielded = BASE_ACCURACY_MULT - HIT_ACCURACY_MULT_TIER_7 scatter = SCATTER_AMOUNT_TIER_9 @@ -167,27 +157,6 @@ damage_falloff_mult = 0 fa_max_scatter = SCATTER_AMOUNT_TIER_5 -/obj/item/weapon/gun/rifle/nsg23/handle_starting_attachment() - ..() - var/obj/item/attachable/stock/nsg23/S = new(src) - S.flags_attach_features &= ~ATTACH_REMOVABLE - S.Attach(src) - update_attachable(S.slot) - -//has no scope or underbarrel -/obj/item/weapon/gun/rifle/nsg23/stripped - starting_attachment_types = list() //starts with the stock anyways due to handle_starting_attachment() - -/obj/item/weapon/gun/rifle/nsg23/no_lock - flags_gun_features = GUN_AUTO_EJECTOR|GUN_CAN_POINTBLANK|GUN_AMMO_COUNTER - starting_attachment_types = list( - /obj/item/attachable/scope/mini/nsg23, - /obj/item/attachable/attached_gun/flamer,//non-op flamer for normal spawns - ) - -/obj/item/weapon/gun/rifle/nsg23/no_lock/stripped - starting_attachment_types = list() //starts with the stock anyways due to handle_starting_attachment() - //M40-SD AKA SOF RIFLE FROM HELL (It's actually an M41A, don't tell!) /obj/item/weapon/gun/rifle/m41aMK1/xm40 @@ -303,6 +272,7 @@ burst_scatter_mult = SCATTER_AMOUNT_TIER_9 scatter_unwielded = SCATTER_AMOUNT_TIER_2 damage_mult = BASE_BULLET_DAMAGE_MULT + damage_falloff_mult = 0 recoil_unwielded = RECOIL_AMOUNT_TIER_2 /obj/item/weapon/gun/rifle/m41aMK1/ap //for making it start with ap loaded diff --git a/code/modules/projectiles/magazines/rifles.dm b/code/modules/projectiles/magazines/rifles.dm index 28e0ed2f4c6..b0ea554a11e 100644 --- a/code/modules/projectiles/magazines/rifles.dm +++ b/code/modules/projectiles/magazines/rifles.dm @@ -429,35 +429,27 @@ // NSG 23 ASSAULT RIFLE - PMC PRIMARY RIFLE /obj/item/ammo_magazine/rifle/nsg23 - name = "\improper NSG 23 magazine (10x24mm)" - desc = "An NSG 23 assault rifle magazine." + name = "\improper NSG L23A1 magazine (10x24mm)" + desc = "An NSG L23A1 assault rifle magazine." caliber = "10x24mm" icon = 'icons/obj/items/weapons/guns/ammo_by_faction/wy.dmi' icon_state = "nsg23" item_state = "nsg23" bonus_overlay = "nsg23_mag_overlay" //needs to be an overlay, as the mag has a hole that would be filled over by the ext overlay - max_rounds = 30 + max_rounds = 89 gun_type = /obj/item/weapon/gun/rifle/nsg23 ammo_band_icon = "+nsg23_band" ammo_band_icon_empty = "+nsg23_band_e" -/obj/item/ammo_magazine/rifle/nsg23/extended - name = "\improper NSG 23 extended magazine (10x24mm)" - desc = "An NSG 23 assault rifle magazine. This one contains 45 bullets." - icon_state = "nsg23_ext" - item_state = "nsg23_ext" - bonus_overlay = "nsg23_ext_overlay" - max_rounds = 45 - /obj/item/ammo_magazine/rifle/nsg23/ap - name = "\improper NSG 23 armor-piercing magazine (10x24mm)" - desc = "An NSG 23 assault rifle magazine. This one is armor piercing." + name = "\improper NSG L23A1 armor-piercing magazine (10x24mm)" + desc = "An NSG L23A1 assault rifle magazine. This one is armor piercing." default_ammo = /datum/ammo/bullet/rifle/ap ammo_band_color = AMMO_BAND_COLOR_AP /obj/item/ammo_magazine/rifle/nsg23/heap - name = "\improper NSG 23 HEAP magazine (10x24mm)" - desc = "An NSG 23 assault rifle magazine. This one is loaded with armor-piercing explosive tipped rounds." + name = "\improper NSG L23A1 HEAP magazine (10x24mm)" + desc = "An NSG L23A1 assault rifle magazine. This one is loaded with armor-piercing explosive tipped rounds." default_ammo = /datum/ammo/bullet/rifle/heap ammo_band_color = AMMO_BAND_COLOR_HEAP diff --git a/colonialmarines.dme b/colonialmarines.dme index a9cd047cc95..d7fdfacaff0 100644 --- a/colonialmarines.dme +++ b/colonialmarines.dme @@ -612,6 +612,7 @@ #include "code\datums\looping_sounds\misc_sounds.dm" #include "code\datums\origin\civilian.dm" #include "code\datums\origin\origin.dm" +#include "code\datums\origin\twe.dm" #include "code\datums\origin\upp.dm" #include "code\datums\origin\uscm.dm" #include "code\datums\pain\_pain.dm" @@ -2028,7 +2029,7 @@ #include "code\modules\mob\living\carbon\human\ai\squad_spawner\squad_army.dm" #include "code\modules\mob\living\carbon\human\ai\squad_spawner\squad_clf.dm" #include "code\modules\mob\living\carbon\human\ai\squad_spawner\squad_cmb.dm" -#include "code\modules\mob\living\carbon\human\ai\squad_spawner\squad_pmc.dm" +#include "code\modules\mob\living\carbon\human\ai\squad_spawner\squad_rmc.dm" #include "code\modules\mob\living\carbon\human\ai\squad_spawner\squad_spawner.dm" #include "code\modules\mob\living\carbon\human\ai\squad_spawner\squad_upp.dm" #include "code\modules\mob\living\carbon\human\ai\squad_spawner\squad_uscm.dm" diff --git a/icons/mob/humans/onmob/belt.dmi b/icons/mob/humans/onmob/belt.dmi index d07f914f5e0..6554794ca2f 100644 Binary files a/icons/mob/humans/onmob/belt.dmi and b/icons/mob/humans/onmob/belt.dmi differ diff --git a/icons/mob/humans/onmob/head_1.dmi b/icons/mob/humans/onmob/head_1.dmi index 72cf1b408f3..a2f88734da3 100644 Binary files a/icons/mob/humans/onmob/head_1.dmi and b/icons/mob/humans/onmob/head_1.dmi differ diff --git a/icons/mob/humans/onmob/items_lefthand_1.dmi b/icons/mob/humans/onmob/items_lefthand_1.dmi index d1c0f742594..fd8e2dd983c 100644 Binary files a/icons/mob/humans/onmob/items_lefthand_1.dmi and b/icons/mob/humans/onmob/items_lefthand_1.dmi differ diff --git a/icons/mob/humans/onmob/items_righthand_1.dmi b/icons/mob/humans/onmob/items_righthand_1.dmi index 65eb329b53b..c6d4f5e2da9 100644 Binary files a/icons/mob/humans/onmob/items_righthand_1.dmi and b/icons/mob/humans/onmob/items_righthand_1.dmi differ diff --git a/icons/mob/humans/onmob/mask.dmi b/icons/mob/humans/onmob/mask.dmi index 4e4ff57331c..20029698b92 100644 Binary files a/icons/mob/humans/onmob/mask.dmi and b/icons/mob/humans/onmob/mask.dmi differ diff --git a/icons/mob/humans/onmob/suit_1.dmi b/icons/mob/humans/onmob/suit_1.dmi index cefff046f74..636820259df 100644 Binary files a/icons/mob/humans/onmob/suit_1.dmi and b/icons/mob/humans/onmob/suit_1.dmi differ diff --git a/icons/mob/humans/onmob/suit_slot.dmi b/icons/mob/humans/onmob/suit_slot.dmi index 547a0ca7b22..cfa4d8844f0 100644 Binary files a/icons/mob/humans/onmob/suit_slot.dmi and b/icons/mob/humans/onmob/suit_slot.dmi differ diff --git a/icons/mob/humans/onmob/uniform_0.dmi b/icons/mob/humans/onmob/uniform_0.dmi index 7428606b0f0..c2eb0533de3 100644 Binary files a/icons/mob/humans/onmob/uniform_0.dmi and b/icons/mob/humans/onmob/uniform_0.dmi differ diff --git a/icons/obj/items/clothing/ties_overlay.dmi b/icons/obj/items/clothing/ties_overlay.dmi index bc83f6c95c8..58596867450 100644 Binary files a/icons/obj/items/clothing/ties_overlay.dmi and b/icons/obj/items/clothing/ties_overlay.dmi differ diff --git a/icons/obj/items/weapons/guns/ammo_by_faction/wy.dmi b/icons/obj/items/weapons/guns/ammo_by_faction/wy.dmi index 6a8bbca97e4..fcc5fa58ad3 100644 Binary files a/icons/obj/items/weapons/guns/ammo_by_faction/wy.dmi and b/icons/obj/items/weapons/guns/ammo_by_faction/wy.dmi differ diff --git a/icons/obj/items/weapons/guns/attachments.dmi b/icons/obj/items/weapons/guns/attachments.dmi index cb0e779d497..d900abde6ca 100644 Binary files a/icons/obj/items/weapons/guns/attachments.dmi and b/icons/obj/items/weapons/guns/attachments.dmi differ diff --git a/icons/obj/items/weapons/guns/attachments/stock.dmi b/icons/obj/items/weapons/guns/attachments/stock.dmi index 79671b0b0b4..453f0f65b3d 100644 Binary files a/icons/obj/items/weapons/guns/attachments/stock.dmi and b/icons/obj/items/weapons/guns/attachments/stock.dmi differ diff --git a/icons/obj/items/weapons/guns/guns_by_faction/wy.dmi b/icons/obj/items/weapons/guns/guns_by_faction/wy.dmi index 44eb7e3543c..166afd95bbe 100644 Binary files a/icons/obj/items/weapons/guns/guns_by_faction/wy.dmi and b/icons/obj/items/weapons/guns/guns_by_faction/wy.dmi differ diff --git a/icons/obj/structures/gun_racks.dmi b/icons/obj/structures/gun_racks.dmi index a5f2e109954..62d77ffcbf5 100644 Binary files a/icons/obj/structures/gun_racks.dmi and b/icons/obj/structures/gun_racks.dmi differ diff --git a/maps/map_files/BMG290_Otogi_Egress_Point/BMG290_Otogi_Egress_Point.dmm b/maps/map_files/BMG290_Otogi_Egress_Point/BMG290_Otogi_Egress_Point.dmm index e9fd2f571c5..2e53f1c5260 100644 --- a/maps/map_files/BMG290_Otogi_Egress_Point/BMG290_Otogi_Egress_Point.dmm +++ b/maps/map_files/BMG290_Otogi_Egress_Point/BMG290_Otogi_Egress_Point.dmm @@ -3637,15 +3637,15 @@ "bLx" = ( /obj/structure/surface/table/almayer, /obj/item/ammo_box/magazine/nsg23, -/obj/item/ammo_magazine/rifle/nsg23/extended{ +/obj/item/ammo_magazine/rifle/nsg23{ pixel_x = -4; pixel_y = 0 }, -/obj/item/ammo_magazine/rifle/nsg23/extended{ +/obj/item/ammo_magazine/rifle/nsg23{ pixel_x = -12; pixel_y = 5 }, -/obj/item/ammo_magazine/rifle/nsg23/extended{ +/obj/item/ammo_magazine/rifle/nsg23{ pixel_x = -9; pixel_y = -2 }, @@ -23035,10 +23035,10 @@ req_access = null; req_one_access = list(202) }, -/obj/item/weapon/gun/rifle/nsg23/no_lock, -/obj/item/weapon/gun/rifle/nsg23/no_lock, +/obj/item/weapon/gun/rifle/nsg23, +/obj/item/weapon/gun/rifle/nsg23, /obj/item/attachable/stock/nsg23, -/obj/item/weapon/gun/rifle/nsg23/no_lock, +/obj/item/weapon/gun/rifle/nsg23, /turf/open/floor/almayer_hull/blackfull, /area/bmg290/keppitz/security) "kOd" = ( diff --git a/maps/map_files/BigRed/BigRed.dmm b/maps/map_files/BigRed/BigRed.dmm index f6d5129973c..0a833dd2f88 100644 --- a/maps/map_files/BigRed/BigRed.dmm +++ b/maps/map_files/BigRed/BigRed.dmm @@ -30257,12 +30257,12 @@ dir = 4 }, /obj/structure/closet/crate, -/obj/item/weapon/gun/rifle/nsg23/no_lock, +/obj/item/weapon/gun/rifle/nsg23, /obj/item/ammo_magazine/rifle/nsg23, /obj/item/ammo_magazine/rifle/nsg23, /obj/item/ammo_magazine/rifle/nsg23/ap, /obj/item/ammo_magazine/rifle/nsg23/ap, -/obj/item/ammo_magazine/rifle/nsg23/extended, +/obj/item/ammo_magazine/rifle/nsg23, /turf/open/floor/plating/platingdmg3/west, /area/bigredv2/caves/mining) "xGm" = ( diff --git a/maps/map_files/BigRed/standalone/crashlanding-offices.dmm b/maps/map_files/BigRed/standalone/crashlanding-offices.dmm index b6b0efb1dc1..dec17af7555 100644 --- a/maps/map_files/BigRed/standalone/crashlanding-offices.dmm +++ b/maps/map_files/BigRed/standalone/crashlanding-offices.dmm @@ -585,7 +585,7 @@ /turf/open/floor/platingdmg1, /area/bigredv2/outside/office_complex) "tr" = ( -/obj/item/weapon/gun/rifle/nsg23/no_lock, +/obj/item/weapon/gun/rifle/nsg23, /turf/open/shuttle/dropship/can_surgery/light_grey_single_wide_up_to_down, /area/bigredv2/outside/office_complex) "tW" = ( @@ -806,10 +806,6 @@ /turf/open/floor/white, /area/bigredv2/outside/office_complex) "Gq" = ( -/obj/item/weapon/gun/rifle/nsg23/no_lock/stripped{ - desc = "A rare sight, this rifle is seen most commonly in the hands of Weyland-Yutani PMCs. Compared to the M41A MK2, it has noticeably improved handling and vastly improved performance at long and medium range, but compares similarly up close. This one seems to have been heavily damaged from impact, you can still see some debris that resembles a scope and underbarrel attachment point on it."; - name = "smashed NSG 23 assault rifle" - }, /turf/open/shuttle/dropship/can_surgery/dark_grey_bottom, /area/bigredv2/outside/office_complex) "Gy" = ( @@ -871,7 +867,7 @@ "Jg" = ( /obj/structure/surface/rack, /obj/item/ammo_magazine/rifle/nsg23, -/obj/item/ammo_magazine/rifle/nsg23/extended, +/obj/item/ammo_magazine/rifle/nsg23, /turf/open/shuttle/dropship/can_surgery/medium_grey_single_wide_up_to_down, /area/bigredv2/outside/office_complex) "Ji" = ( @@ -1144,7 +1140,7 @@ /area/bigredv2/outside/office_complex) "XG" = ( /obj/effect/decal/cleanable/blood, -/obj/item/weapon/gun/rifle/nsg23/no_lock, +/obj/item/weapon/gun/rifle/nsg23, /turf/open/shuttle/dropship/light_grey_single_wide_up_to_down, /area/bigredv2/outside/office_complex) "Yb" = ( diff --git a/maps/map_files/LV624/LV624.dmm b/maps/map_files/LV624/LV624.dmm index 5a77eb5fee5..eacec025172 100644 --- a/maps/map_files/LV624/LV624.dmm +++ b/maps/map_files/LV624/LV624.dmm @@ -15333,8 +15333,8 @@ /area/lv624/lazarus/quart) "qxu" = ( /obj/structure/surface/rack, -/obj/item/ammo_magazine/rifle/nsg23/extended, -/obj/item/weapon/gun/rifle/nsg23/no_lock, +/obj/item/ammo_magazine/rifle/nsg23, +/obj/item/weapon/gun/rifle/nsg23, /turf/open/shuttle/bright_red, /area/lv624/lazarus/crashed_ship_containers) "qxX" = ( diff --git a/maps/map_files/LV624/hydro/30.destroyed.dmm b/maps/map_files/LV624/hydro/30.destroyed.dmm index 2396cc92639..32d250fd437 100644 --- a/maps/map_files/LV624/hydro/30.destroyed.dmm +++ b/maps/map_files/LV624/hydro/30.destroyed.dmm @@ -292,12 +292,12 @@ health = 140; icon_state = "folding_2" }, -/obj/item/weapon/gun/rifle/nsg23/no_lock, +/obj/item/weapon/gun/rifle/nsg23, /obj/item/ammo_magazine/rifle/nsg23, /turf/open/floor/plating/panelscorched, /area/lv624/lazarus/hydroponics) "Aj" = ( -/obj/item/ammo_magazine/rifle/nsg23/extended, +/obj/item/ammo_magazine/rifle/nsg23, /obj/item/stack/sheet/wood, /turf/open/floor/plating/panelscorched, /area/lv624/lazarus/hydroponics) @@ -403,7 +403,6 @@ /obj/structure/barricade/wooden{ dir = 4 }, -/obj/item/weapon/gun/rifle/nsg23/no_lock, /turf/open/floor/plating/platingdmg3, /area/lv624/lazarus/hydroponics) "MW" = (