diff --git a/code/__DEFINES/shuttles.dm b/code/__DEFINES/shuttles.dm index 126a8f82ece8..d283656ccae6 100644 --- a/code/__DEFINES/shuttles.dm +++ b/code/__DEFINES/shuttles.dm @@ -95,6 +95,7 @@ #define MOBILE_SHUTTLE_ID_ERT1 "ert_response_shuttle" #define MOBILE_SHUTTLE_ID_ERT2 "ert_pmc_shuttle" #define MOBILE_SHUTTLE_ID_ERT3 "ert_upp_shuttle" +#define MOBILE_SHUTTLE_ID_ERT4 "ert_twe_shuttle" #define MOBILE_SHUTTLE_ID_ERT_SMALL "ert_rescue_shuttle" #define MOBILE_SHUTTLE_ID_ERT_BIG "ert_boarding_shuttle" diff --git a/code/datums/emergency_calls/royal_marines.dm b/code/datums/emergency_calls/royal_marines.dm index d879715e6ed5..331aa44fa422 100644 --- a/code/datums/emergency_calls/royal_marines.dm +++ b/code/datums/emergency_calls/royal_marines.dm @@ -1,18 +1,19 @@ /datum/emergency_call/royal_marines - name = "Military Contractors (Squad) (Friendly)" + name = "Royal Marines Commando (Squad) (Friendly)" mob_max = 7 probability = 20 - - max_engineers = 1 - max_medics = 1 - max_heavies = 1 + name_of_spawn = /obj/effect/landmark/ert_spawns/distress_twe + item_spawn = /obj/effect/landmark/ert_spawns/distress_twe/item + max_engineers = 0 + max_medics = 0 + max_heavies = 3 var/max_synths = 1 var/synths = 1 /datum/emergency_call/royal_marines/New() ..() - arrival_message = "[MAIN_SHIP_NAME], this is USCSS Inheritor with Vanguard's Arrow Incorporated, Primary Operations; we are responding to your distress call and boarding in accordance with the Military Aid Act of 2177, authenticication code Lima-18153. " + arrival_message = "[MAIN_SHIP_NAME], this is [pick(50;"HMS Patna", 50;"HMS Thunderchild",)]; we are responding to your distress call and boarding in accordance with the Military Aid Act of 2177, authenticication code Lima-18153. " objectives = "Ensure the survival of the [MAIN_SHIP_NAME], eliminate any hostiles, and assist the crew in any way possible." @@ -27,55 +28,57 @@ 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 Contractor Team Leader of Vanguard's Arrow Incorporated!")) - arm_equipment(mob, /datum/equipment_preset/contractor/duty/leader, TRUE, TRUE) - 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 Contractor Medical Specialist of Vanguard's Arrow Incorporated!")) - arm_equipment(mob, /datum/equipment_preset/contractor/duty/medic, TRUE, TRUE) + 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/royal_marine/lieuteant, 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 Contractor Machinegunner of Vanguard's Arrow Incorporated!")) - arm_equipment(mob, /datum/equipment_preset/contractor/duty/heavy, TRUE, TRUE) - else if(engineers < max_engineers && HAS_FLAG(mob.client.prefs.toggles_ert, PLAY_ENGINEER) && check_timelock(mob.client, JOB_SQUAD_ENGI)) - engineers++ - to_chat(mob, SPAN_ROLE_HEADER("You are a Contractor Engineering Specialist of Vanguard's Arrow Incorporated!")) - arm_equipment(mob, /datum/equipment_preset/contractor/duty/engi, TRUE, TRUE) + 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/royal_marine/spec, 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 Smartgunner in the Royal Marines Commando. Born in the three world empire.")) + arm_equipment(mob, /datum/equipment_preset/royal_marine/spec/machinegun, 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 CQB Specialist in the Royal Marines Commando. Born in the three world empire.")) + arm_equipment(mob, /datum/equipment_preset/royal_marine/spec/breacher, TRUE, TRUE) else to_chat(mob, SPAN_ROLE_HEADER("You are a Contractor of Vanguard's Arrow Incorporated!")) - arm_equipment(mob, /datum/equipment_preset/contractor/duty/standard, TRUE, TRUE) + arm_equipment(mob, /datum/equipment_preset/royal_marine/standard, TRUE, TRUE) print_backstory(mob) addtimer(CALLBACK(GLOBAL_PROC, GLOBAL_PROC_REF(to_chat), mob, SPAN_BOLD("Objectives: [objectives]")), 1 SECONDS) -/datum/emergency_call/contractors/print_backstory(mob/living/carbon/human/M) +/datum/emergency_call/royal_marines/print_backstory(mob/living/carbon/human/M) if(ishuman_strict(M)) - to_chat(M, SPAN_BOLD("You were born [pick(60;"in the Three World Empire", 20;"on Earth", 20;"on a colony")] to a [pick(75;"average", 15;"poor", 10;"well-established")] family.")) - to_chat(M, SPAN_BOLD("Joining the USCM gave you a lot of combat experience and useful skills but changed you.")) - to_chat(M, SPAN_BOLD("After getting out, you couldn't hold a job with the things you saw and did, deciding to put your skills to use you joined a Military Contractor firm.")) - to_chat(M, SPAN_BOLD("You are a skilled mercenary, making better pay than in the Corps.")) + to_chat(M, SPAN_BOLD("You were born in the Three World Empire to a [pick(75;"average", 15;"poor", 10;"well-established")] family.")) + to_chat(M, SPAN_BOLD("Joining the Royal Marines gave you a lot of combat experience and useful skills.")) else - to_chat(M, SPAN_BOLD("You were brought online in a civilian factory.")) + to_chat(M, SPAN_BOLD("You were brought online in a Tokyo lab.")) to_chat(M, SPAN_BOLD("You were programmed with all of the medical and engineering knowledge a military fighting force support asset required.")) - to_chat(M, SPAN_BOLD("You were soon after bought by Vanguard's Arrow Incorporated(VAI) to act as support personnel.")) - to_chat(M, SPAN_BOLD("Some months after your purchase, you were assigned to the USCSS Inheritor, a VAI transport vessel.")) + to_chat(M, SPAN_BOLD("You were soon after assigned to a royal marine base on mars to act as support personnel.")) + to_chat(M, SPAN_BOLD("Some months after your assignment, you were reassigned to the USCSS Inheritor, a VAI transport vessel.")) to_chat(M, SPAN_BOLD("You are [pick(80;"unaware", 15;"faintly aware", 5;"knowledgeable")] of the xenomorph threat.")) - to_chat(M, SPAN_BOLD("You are employed by Vanguard's Arrow Incorporated(VAI), as a member of VAI Primary Operations(VAIPO)")) - to_chat(M, SPAN_BOLD("You are stationed on-board the USCSS Inheritor, a part of VAIPO Task-Force Charlie.")) - to_chat(M, SPAN_BOLD("Under the directive of the VAI executive board, you have been assist in riot control, military aid, and to assist USCMC forces wherever possible.")) - to_chat(M, SPAN_BOLD("The USCSS Inheritor is staffed with crew of roughly three hundred military contractors, and fifty support personnel.")) + to_chat(M, SPAN_BOLD("You are a citizen of the three world empire and joined the Royal Marines Commando")) + to_chat(M, SPAN_BOLD("You are apart of a jointed UA/TWE taskforce onboard the HMS Patna and Thunderchild.")) + to_chat(M, SPAN_BOLD("Under the directive of the RMC high command, you have been assisting USCM forces with maintaining peace in the area.")) to_chat(M, SPAN_BOLD("Assist the USCMC Force of the [MAIN_SHIP_NAME] however you can.")) - to_chat(M, SPAN_BOLD("As a side-objective, VAI has been hired by an unknown benefactor to engage in corporate espionage and sabotage against Weyland-Yutani, avoid direct conflict; you aren't VAISO; but attempt to recover Wey-Yu secrets and plans if possible.")) /datum/emergency_call/contractors/platoon - name = "Military Contractors (Platoon) (Friendly)" + name = "Royal Marines Commando (Platoon) (Friendly)" mob_min = 7 mob_max = 28 probability = 0 - max_medics = 3 - max_heavies = 3 - max_engineers = 2 + max_medics = 0 + max_heavies = 6 + max_engineers = 0 max_synths = 2 + +/obj/effect/landmark/ert_spawns/distress_twe + name = "Distress_TWE" + +/obj/effect/landmark/ert_spawns/distress_twe/item + name = "Distress_TWEItem" diff --git a/code/datums/paygrades/factions/twe/twe.dm b/code/datums/paygrades/factions/twe/twe.dm index 214d70890c18..e7027757bf9d 100644 --- a/code/datums/paygrades/factions/twe/twe.dm +++ b/code/datums/paygrades/factions/twe/twe.dm @@ -5,33 +5,33 @@ //TWE RMC /datum/paygrade/twe/rc1 paygrade = "TC1" - name = "Yonto" - prefix = "Yt." + name = "Marine" + prefix = "Mne" /datum/paygrade/twe/rc2 paygrade = "TC2" - name = "Santo" - prefix = "St." + name = "Lance Corporal" + prefix = "LCpl" pay_multiplier = 2.1 /datum/paygrade/twe/rc3 paygrade = "TC3" - name = "Nito" - prefix = "Nt." + name = "Corporal" + prefix = "Cpl" pay_multiplier = 2.2 /datum/paygrade/twe/rc4 paygrade = "TC4" - name = "Itto" - prefix = "It." + name = "Sergeant" + prefix = "Sgt" pay_multiplier = 2.3 //TWE Naval Officers /datum/paygrade/twe/o1 paygrade = "TO1" - name = "Seaman" - prefix = "SN." + name = "Second Lieutenant" + prefix = "OF1" pay_multiplier = 3 /datum/paygrade/twe/o2 diff --git a/code/datums/skills.dm b/code/datums/skills.dm index b70b2bb9b7b0..c3e83bcb6e75 100644 --- a/code/datums/skills.dm +++ b/code/datums/skills.dm @@ -1957,3 +1957,60 @@ MISCELLANEOUS SKILL_EXECUTION = SKILL_EXECUTION_MAX, SKILL_INTEL = SKILL_INTEL_MAX, ) + +/* +---------------------------- +Royal Marines Commando +---------------------------- +*/ + +//NOTE: Skills take heavy from PMCs + +/datum/skills/rmc/rifleman + name = "Royal Marines Commando Rifleman" + skills = list( + SKILL_CQC = SKILL_CQC_TRAINED, + SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, + SKILL_POLICE = SKILL_POLICE_SKILLED, + SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, + SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_ENDURANCE = SKILL_ENDURANCE_MASTER, + SKILL_MEDICAL = SKILL_MEDICAL_MEDIC, + SKILL_SURGERY = SKILL_SURGERY_NOVICE, + ) + +/datum/skills/rmc/specialist + name = "Royal Marines Commando Specialist" + skills = list( + SKILL_CQC = SKILL_CQC_TRAINED, + SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, + SKILL_POLICE = SKILL_POLICE_SKILLED, + SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, + SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_CQC = SKILL_CQC_TRAINED, + SKILL_SPEC_WEAPONS = SKILL_SPEC_SMARTGUN, + SKILL_MELEE_WEAPONS = SKILL_MELEE_TRAINED, + SKILL_ENDURANCE = SKILL_ENDURANCE_MASTER, + SKILL_JTAC = SKILL_JTAC_BEGINNER, + SKILL_MEDICAL = SKILL_MEDICAL_MEDIC, + SKILL_SURGERY = SKILL_SURGERY_NOVICE, + ) + +/datum/skills/rmc/leader + name = "Royal Marines Commando Leader" + skills = list( + SKILL_FIREARMS = SKILL_FIREARMS_EXPERT, + SKILL_POLICE = SKILL_POLICE_SKILLED, + SKILL_FIREMAN = SKILL_FIREMAN_SKILLED, + SKILL_CONSTRUCTION = SKILL_CONSTRUCTION_ENGI, + SKILL_ENGINEER = SKILL_ENGINEER_ENGI, + SKILL_CQC = SKILL_CQC_SKILLED, + SKILL_LEADERSHIP = SKILL_LEAD_TRAINED, + SKILL_MEDICAL = SKILL_MEDICAL_TRAINED, + SKILL_ENDURANCE = SKILL_ENDURANCE_MASTER, + SKILL_JTAC = SKILL_JTAC_TRAINED, + SKILL_MEDICAL = SKILL_MEDICAL_MEDIC, + SKILL_SURGERY = SKILL_SURGERY_NOVICE, + ) diff --git a/code/game/objects/items/devices/radio/encryptionkey.dm b/code/game/objects/items/devices/radio/encryptionkey.dm index fc1231838ec4..c882711d7ea0 100644 --- a/code/game/objects/items/devices/radio/encryptionkey.dm +++ b/code/game/objects/items/devices/radio/encryptionkey.dm @@ -316,7 +316,7 @@ /obj/item/device/encryptionkey/royal_marine name = "\improper Royal Marine Radio Encryption Key" icon_state = "sl_key" - channels = list("Command" = TRUE, "Almayer" = TRUE, "Royal Marine" = TRUE) + channels = list("Command" = TRUE, "Almayer" = TRUE,) /obj/item/device/encryptionkey/cmb name = "\improper Colonial Marshal Bureau Radio Encryption Key" icon_state = "cmb_key" diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index 9068e3c0cb87..fec25c11bf98 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -966,10 +966,10 @@ /obj/item/device/radio/headset/distress/royal_marine name = "Royal Marine Headset" - desc = "..." + desc = "A sleek headset used by the Royal Marines Commando. Low profile enough to fit under their unique helmets." frequency = RMC_FREQ icon_state = "vai_headset" - initial_keys = list(/obj/item/device/encryptionkey/royal_marine, /obj/item/device/encryptionkey/public,) + initial_keys = list(/obj/item/device/encryptionkey/public, /obj/item/device/encryptionkey/royal_marine) has_hud = TRUE //CMB Headsets diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm index e36225177d91..5bc70c84b2c9 100644 --- a/code/game/objects/items/storage/backpack.dm +++ b/code/game/objects/items/storage/backpack.dm @@ -1089,3 +1089,59 @@ GLOBAL_LIST_EMPTY_TYPED(radio_packs, /obj/item/storage/backpack/marine/satchel/r max_storage_space = 21 camo_alpha = 10 + +//----------TWE SECTION---------- +/obj/item/storage/backpack/rmc + has_gamemode_skin = FALSE + +/obj/item/storage/backpack/rmc/heavy + name = "\improper heavyweight RMC backpack" + 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 = 26 + +/obj/item/storage/backpack/rmc/heavy/black + icon_state = "black_backpack_large" + item_state = "black_backpack_large" + +/obj/item/storage/backpack/rmc/medium + name = "\improper standard RMC backpack" + desc = "A TWE military standard-carry RMC combat pack MK3." + icon_state = "backpack_medium" + item_state = "backpack_medium" + worn_accessible = TRUE + max_storage_space = 20 + +/obj/item/storage/backpack/rmc/medium/black + icon_state = "black_backpack_medium" + item_state = "black_backpack_medium" + +/obj/item/storage/backpack/rmc/light + name = "\improper lightweight RMC backpack" + desc = "A TWE military light-carry RMC combat pack MK3." + icon_state = "backpack_small" + item_state = "backpack_small" + worn_accessible = TRUE + max_storage_space = 15 + +/obj/item/storage/backpack/rmc/light/black + icon_state = "black_backpack_small" + item_state = "black_backpack_small" + +/obj/item/storage/backpack/rmc/frame + name = "\improper RMC carry-frame" + desc = "A backpack specifically designed to hold RMC weapons and shields." + icon_state = "backpack_frame" + item_state = "backpack_frame" + max_w_class = SIZE_HUGE + storage_slots = 1 + can_hold = list(/obj/item/mortar_shell) // PLACEHOLDER PLEASE REPLACE + +/obj/item/storage/backpack/general_belt/rmc + name = "\improper RMC general utility belt" + desc = "A small, lightweight pouch that can be clipped onto armor to provide additional storage. This new RMC model, while uncomfortable, can also be clipped around the waist." + icon_state = "rmc_general" + item_state = "rmc_general" + has_gamemode_skin = FALSE + max_storage_space = 12 diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm index b63c8bb9642b..cbfe83f698c6 100644 --- a/code/game/objects/items/storage/belt.dm +++ b/code/game/objects/items/storage/belt.dm @@ -496,19 +496,6 @@ for(var/i = 1 to storage_slots) new /obj/item/ammo_magazine/handful/shotgun/buckshot(src) - -/obj/item/storage/belt/marine/royal_marine/ - name = "ammo load rig" - desc = "Good for carrying around extra ammo in the heat of the jungle. Made of special rot-resistant fabric." - -/obj/item/storage/belt/marine/royal_marine/rmc_f90_ammo/fill_preset_inventory() - for(var/i = 1 to storage_slots) - new /obj/item/ammo_magazine/rifle/rmc_f90(src) - -/obj/item/storage/belt/marine/royal_marine/rmc_f90_ammo/marksman/fill_preset_inventory() - for(var/i = 1 to storage_slots) - new /obj/item/ammo_magazine/rifle/rmc_f90/marksman(src) - /obj/item/storage/belt/marine/smartgunner name = "\improper M280 pattern smartgunner drum belt" desc = "Despite the fact that 1. drum magazines are incredibly non-ergonomical, and 2. require incredibly precise machining in order to fit universally (spoiler, they don't, adding further to the myth of 'Smartgun Personalities'), the USCM decided to issue a modified marine belt (more formally known by the designation M280) with hooks and dust covers (overly complex for the average jarhead) for the M56B system's drum munitions. When the carry catch on the drum isn't getting stuck in the oiled up velcro, the rig actually does do a decent job at holding a plentiful amount of drums. But at the end of the day, compared to standard rigs... it sucks, but isn't that what being a Marine is all about?" @@ -1145,6 +1132,15 @@ for(var/i = 1 to storage_slots - 1) new /obj/item/ammo_magazine/pistol/highpower/black(src) +/obj/item/storage/belt/gun/m4a3/vp78/fill_preset_inventory() + handle_item_insertion(new /obj/item/weapon/gun/pistol/vp78()) + new /obj/item/ammo_magazine/pistol/vp78(src) + new /obj/item/ammo_magazine/pistol/vp78(src) + new /obj/item/ammo_magazine/pistol/vp78(src) + new /obj/item/ammo_magazine/pistol/vp78(src) + new /obj/item/ammo_magazine/pistol/vp78(src) + new /obj/item/ammo_magazine/pistol/vp78(src) + /obj/item/storage/belt/gun/m44 name = "\improper M276 pattern M44 holster rig" desc = "The M276 is the standard load-bearing equipment of the USCM. It consists of a modular belt with various clips. This version is for the M44 magnum revolver, along with six small pouches for speedloaders. It smells faintly of hay." @@ -1714,3 +1710,52 @@ item_state = "souto_man[length(contents)]" if(istype(user)) user.update_inv_belt() //Makes sure the onmob updates. + + + +//ROYAL MARINES COMMNADO + +/obj/item/storage/belt/marine/rmc + name = "\improper L70 pattern ammo load rig" + desc = "Good for carrying around extra ammo in the heat of the jungle. Made of special rot-resistant fabric." + icon_state = "rmc_ammo" + item_state = "rmc_ammo" + flags_atom = NO_NAME_OVERRIDE|NO_SNOW_TYPE + has_gamemode_skin = FALSE + +/obj/item/storage/belt/marine/rmc/rmc_f90_ammo/fill_preset_inventory() + for(var/i = 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 = 1 to storage_slots) + new /obj/item/ammo_magazine/rifle/rmc_f90/marksman(src) + +/obj/item/storage/belt/medical/rmc + name = "\improper L75 pattern medical storage rig" + desc = "The L75 is the standard load-bearing equipment of the RMC. It consists of a modular belt with various clips. This version is designed to transport medical supplies and pistol ammunition. \nRight click its sprite and click \"toggle belt mode\" to take pills out of bottles by simply clicking them." + icon_state = "rmc_medical" + item_state = "rmc_medical" + flags_atom = NO_NAME_OVERRIDE|NO_SNOW_TYPE + +/obj/item/storage/belt/gun/l905 + name = "\improper L905 gunbelt" + desc = "Finely-tooled leather, a L905, and six magazines. More than enough for the standard RMC commando." + icon_state = "rmc_pistol" + item_state = "rmc_pistol" + flags_atom = NO_NAME_OVERRIDE|NO_SNOW_TYPE + storage_slots = 7 + can_hold = list( + /obj/item/weapon/gun/pistol/vp78, + /obj/item/ammo_magazine/pistol/vp78, + ) + has_gamemode_skin = FALSE + holster_slots = list( // PLACEHOLDER PLEASE REPLACE + "1" = list( + "icon_x" = -1, + "icon_y" = -3)) + +/obj/item/storage/belt/gun/l905/full/fill_preset_inventory() + handle_item_insertion(new /obj/item/weapon/gun/pistol/vp78()) + for(var/i in 1 to storage_slots - 1) + new /obj/item/ammo_magazine/pistol/vp78(src) diff --git a/code/modules/clothing/gloves/marine_gloves.dm b/code/modules/clothing/gloves/marine_gloves.dm index 19ecb4825fc6..f20967e22eed 100644 --- a/code/modules/clothing/gloves/marine_gloves.dm +++ b/code/modules/clothing/gloves/marine_gloves.dm @@ -188,10 +188,7 @@ //=ROYAL MARINES=\\ /obj/item/clothing/gloves/marine/veteran/royal_marine - name = "\improper RMC combat gloves" - desc = "Standard issue tactical gloves." + name = "\improper L6 pattern combat gloves" + desc = "Standard issue tactical gloves used by the royal marines." icon_state = "rmc_gloves" flags_atom = NO_NAME_OVERRIDE - -/obj/item/clothing/gloves/marine/veteran/royal_marine/snow - icon_state = "s_rmc_gloves" diff --git a/code/modules/clothing/head/head.dm b/code/modules/clothing/head/head.dm index 9f73a75673e9..9baf96fa157a 100644 --- a/code/modules/clothing/head/head.dm +++ b/code/modules/clothing/head/head.dm @@ -771,7 +771,8 @@ D //=ROYAL MARINES=\\ /obj/item/clothing/head/beanie/royal_marine - name = "beanie" + name = "royal marine beanie" + desc = "A standard military beanie." icon_state = "rmc_beanie" item_state = "rmc_beanie" icon = 'icons/obj/items/clothing/cm_hats.dmi' @@ -780,22 +781,22 @@ D ) /obj/item/clothing/head/beanie/royal_marine/turban - name = "RMC turban" - desc = "Turban." + name = "royal marine turban" + desc = "A standard military turban found in the royal marines. Considered a rare item these kind of turbans are prized by collectors in the UA." icon_state = "rmc_turban" item_state = "rmc_turban" /obj/item/clothing/head/beret/royal_marine - desc = "RMC beret." + name = "royal marine baret" + 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." icon_state = "rmc_beret" item_state = "rmc_beret" icon = 'icons/obj/items/clothing/cm_hats.dmi' - flags_atom = NO_NAME_OVERRIDE + flags_atom = NO_NAME_OVERRIDE|NO_SNOW_TYPE item_icons = list( WEAR_HEAD = 'icons/mob/humans/onmob/head_1.dmi' ) /obj/item/clothing/head/beret/royal_marine/team_leader - desc = "RMC team leader beret" icon_state = "rmc_beret_tl" item_state = "rmc_beret_tl" diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index 1ec7632f2369..a8ffc08413d8 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -1248,8 +1248,8 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list( //=ROYAL MARINES=\\ /obj/item/clothing/head/helmet/marine/veteran/royal_marine - name = "L5A2 RMC helmet" - desc = "A High-cut ballistic helmet." + name = "L5A2 ballistic helmet" + desc = "A High-cut ballistic helmet. Designed by Lindenthal-Ehrenfeld Militärindustrie it is intended to be used by Royal Marines Commando as part of the kestrel armour system." icon_state = "rmc_helm1" item_state = "rmc_helm1" armor_energy = CLOTHING_ARMOR_MEDIUMLOW @@ -1261,3 +1261,9 @@ GLOBAL_LIST_INIT(allowed_helmet_items, list( flags_inv_hide = NO_FLAGS flags_marine_helmet = NO_FLAGS flags_atom = NO_NAME_OVERRIDE + +/obj/item/clothing/head/helmet/marine/veteran/royal_marine/team_lead + name = "L5A3 ballistic helmet" + desc = "A High-cut ballistic helmet featuring an attached mandible. Designed by Lindenthal-Ehrenfeld Militärindustrie it is intended to be used by Royal Marines Commando as part of the kestrel armour system" + icon_state = "rmc_helm_tl" + item_state = "rmc_helm_tl" diff --git a/code/modules/clothing/shoes/marine_shoes.dm b/code/modules/clothing/shoes/marine_shoes.dm index 9f37580e4dc4..b4aa789cbd44 100644 --- a/code/modules/clothing/shoes/marine_shoes.dm +++ b/code/modules/clothing/shoes/marine_shoes.dm @@ -200,7 +200,7 @@ //=ROYAL MARINES=\\ /obj/item/clothing/shoes/veteran/royal_marine - name = "RMC combat boots" + name = "\improper L10 pattern combat boots" desc = "Standard issue combat boots for combat scenarios or combat situations. Used by the three world empires royal marines commando units." icon_state = "rmc_boots" armor_melee = CLOTHING_ARMOR_MEDIUMHIGH @@ -226,7 +226,7 @@ /obj/item/clothing/shoes/veteran/royal_marine/knife /obj/item/clothing/shoes/veteran/royal_marine/knife/Initialize(mapload, ...) . = ..() - stored_item = new /obj/item/attachable/bayonet(src) + stored_item = new /obj/item/attachable/bayonet/rmc(src) update_icon() /obj/item/clothing/shoes/veteran/royal_marine/knife/snow diff --git a/code/modules/clothing/suits/marine_armor.dm b/code/modules/clothing/suits/marine_armor.dm index 7ecc5ea31826..95e1747e5db0 100644 --- a/code/modules/clothing/suits/marine_armor.dm +++ b/code/modules/clothing/suits/marine_armor.dm @@ -1730,11 +1730,13 @@ //=ROYAL MARINES=\\ -/obj/item/clothing/suit/storage/marine/veteran/royal_marine/ +/obj/item/clothing/suit/storage/marine/veteran/royal_marine name = "kestrel armoured vest" - desc = "kestrel armoured vest" + desc = "A customizable personal 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_light" + item_state = "rmc_light" flags_atom = NO_NAME_OVERRIDE + storage_slots = 3 allowed = list( /obj/item/weapon/gun, /obj/item/tank/emergency_oxygen, @@ -1754,24 +1756,26 @@ /obj/item/clothing/suit/storage/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 - storage_slots = 2 slowdown = SLOWDOWN_ARMOR_LIGHT /obj/item/clothing/suit/storage/marine/veteran/royal_marine/light/team_leader //RMC TL & LT Armor icon_state = "rmc_light_padded" + item_state = "rmc_light_padded" armor_bullet = CLOTHING_ARMOR_MEDIUMHIGH armor_energy = CLOTHING_ARMOR_MEDIUMLOW armor_bomb = CLOTHING_ARMOR_MEDIUM armor_rad = CLOTHING_ARMOR_MEDIUM - storage_slots = 2 slowdown = SLOWDOWN_ARMOR_LIGHT + storage_slots = 5 /obj/item/clothing/suit/storage/marine/veteran/royal_marine/medium //Smartgun Spec Armor - icon_state = "rmc_medium" + icon_state = "rmc_pointman" + item_state = "rmc_pointman" armor_melee = CLOTHING_ARMOR_MEDIUM armor_bullet = CLOTHING_ARMOR_MEDIUM armor_laser = CLOTHING_ARMOR_MEDIUMLOW @@ -1782,9 +1786,11 @@ armor_internaldamage = CLOTHING_ARMOR_MEDIUM movement_compensation = SLOWDOWN_ARMOR_LIGHT storage_slots = 3 + flags_inventory = BLOCKSHARPOBJ|BLOCK_KNOCKDOWN|SMARTGUN_HARNESS /obj/item/clothing/suit/storage/marine/veteran/royal_marine/pointman //Pointman Spec Armor - icon_state = "rmc_pointman" + icon_state = "rmc_medium" + item_state = "rmc_medium" armor_melee = CLOTHING_ARMOR_HIGH armor_bullet = CLOTHING_ARMOR_HIGHPLUS armor_bomb = CLOTHING_ARMOR_HIGHPLUS diff --git a/code/modules/clothing/under/marine_uniform.dm b/code/modules/clothing/under/marine_uniform.dm index e5af6ea1b6ed..a3b410e5ee35 100644 --- a/code/modules/clothing/under/marine_uniform.dm +++ b/code/modules/clothing/under/marine_uniform.dm @@ -937,20 +937,18 @@ //=ROYAL MARINES=\\ /obj/item/clothing/under/marine/veteran/royal_marine - name = "RMC uniform" - desc = "Royal Marine Uniform" + name = "royal marines commando uniform" + desc = "The field uniform of the royal marines commando. They have shards of light Kevlar to help protect against stabbing weapons and bullets. Onpar with similar USCM equipment" icon_state = "rmc_uniform" worn_state = "rmc_uniform" - flags_atom = NO_NAME_OVERRIDE + flags_atom = NO_NAME_OVERRIDE|NO_SNOW_TYPE /obj/item/clothing/under/marine/veteran/royal_marine/tl - name = "RMC team leader uniform" - desc = "Royal Marine Uniform" icon_state = "rmc_uniform_teaml" worn_state = "rmc_uniform_teaml" /obj/item/clothing/under/marine/veteran/royal_marine/lt - name = "RMC officer Uniform" - desc = "Royal Marine Uniform" + name = "royal marines commando officers uniform" + desc = "The officers uniform of the royal marines commando. They have shards of light Kevlar to help protect against stabbing weapons and bullets. Onpar with similar USCM equipment" icon_state = "rmc_uniform_lt" worn_state = "rmc_uniform_lt" diff --git a/code/modules/clothing/under/ties.dm b/code/modules/clothing/under/ties.dm index d42e7d17bfd2..cdc7db3fbaf9 100644 --- a/code/modules/clothing/under/ties.dm +++ b/code/modules/clothing/under/ties.dm @@ -359,6 +359,11 @@ desc = "A fire-resistant shoulder patch, worn by the men and women of the USS Hanyut, USCM FORECON." icon_state = "forecon_patch" +/obj/item/clothing/accessory/patch/royal_marines + name = "TWE Royal Marines Commando patch" + desc = "A fire-resistant shoulder patch, worn by the men and women of the royal marines commando." + icon_state = "commandopatch" + /obj/item/clothing/accessory/poncho name = "USCM Poncho" desc = "The standard USCM poncho has variations for every climate. Custom fitted to be attached to standard USCM armor variants it is comfortable, warming or cooling as needed, and well-fit. A marine couldn't ask for more. Affectionately referred to as a \"woobie\"." diff --git a/code/modules/gear_presets/royal_marines.dm b/code/modules/gear_presets/royal_marines.dm index 23d24c62b01a..d11f14030156 100644 --- a/code/modules/gear_presets/royal_marines.dm +++ b/code/modules/gear_presets/royal_marines.dm @@ -41,8 +41,8 @@ //*****************************************************************************************************/ /datum/equipment_preset/royal_marine - name = "Military Contractor" - faction = FACTION_CONTRACTOR + name = "Royal Marine Commando" + faction = FACTION_TWE rank = JOB_TWE_RMC_RIFLEMAN faction = FACTION_TWE faction_group = FACTION_LIST_ERT @@ -85,7 +85,7 @@ new_human.g_hair = rand(15,35) new_human.b_hair = rand(25,45) -/datum/equipment_preset/contractor/load_id(mob/living/carbon/human/new_human, client/mob_client) +/datum/equipment_preset/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)) @@ -97,30 +97,35 @@ /datum/equipment_preset/royal_marine/standard name = "RMC TWE Royal Marine Commando (Rifleman)" - paygrade = "PVT" + paygrade = "TC1" role_comm_title = "RMC" flags = EQUIPMENT_PRESET_EXTRA assignment = "Royal Marine Rifleman" rank = JOB_TWE_RMC_RIFLEMAN - skills = /datum/skills/pmc + skills = /datum/skills/rmc/rifleman faction = FACTION_TWE /datum/equipment_preset/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/under/marine/veteran/royal_marine, WEAR_BODY) + 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/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/storage/belt/marine/royal_marine/rmc_f90_ammo, WEAR_WAIST) + 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/clothing/gloves/marine/veteran/royal_marine, WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/royal_marine, WEAR_HEAD) + 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/shoes/veteran/royal_marine/knife, WEAR_FEET) // - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack, WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge, WEAR_IN_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/explosive/plastic/breaching_charge, WEAR_IN_JACKET) new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar/tactical, 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/tool/crowbar/tactical, WEAR_IN_JACKET) + 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/surgical_line, 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/weapon/gun/rifle/rmc_f90, WEAR_J_STORE) // @@ -128,34 +133,41 @@ 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/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/head/helmet/marine/veteran/royal_marine, WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/pmc/royal_marine, WEAR_FACE) + //*****************************************************************************************************/ /datum/equipment_preset/royal_marine/spec name = "RMC TWE Royal Marine Commando (Marksman)" - paygrade = "PVT" + paygrade = "TC2" role_comm_title = "RMC" flags = EQUIPMENT_PRESET_EXTRA assignment = "Royal Marine Marksman" rank = JOB_TWE_RMC_SPECIALIST - skills = /datum/skills/pmc/specialist + skills = /datum/skills/rmc/specialist /datum/equipment_preset/royal_marine/spec/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/under/marine/veteran/royal_marine, WEAR_BODY) + 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/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/storage/belt/marine/royal_marine/rmc_f90_ammo/marksman, WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/storage/belt/marine/rmc/rmc_f90_ammo/marksman, WEAR_WAIST) new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/royal_marine, WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/royal_marine, WEAR_HEAD) + 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/shoes/veteran/royal_marine/knife, WEAR_FEET) // - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack, WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/rmc/medium, WEAR_BACK) + 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/storage/firstaid/regular, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar/tactical, 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/tool/crowbar/tactical, WEAR_IN_JACKET) + 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/surgical_line, 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/weapon/gun/rifle/rmc_f90/scope, WEAR_J_STORE) // @@ -163,35 +175,125 @@ 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/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/head/helmet/marine/veteran/royal_marine, WEAR_HEAD) + new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/pmc/royal_marine, WEAR_FACE) + +//*****************************************************************************************************/ + +/datum/equipment_preset/royal_marine/spec/breacher + name = "RMC TWE Royal Marine Commando (Breacher)" + paygrade = "TC2" + role_comm_title = "RMC" + flags = EQUIPMENT_PRESET_EXTRA + assignment = "Royal Marine Breacher" + rank = JOB_TWE_RMC_SPECIALIST + skills = /datum/skills/rmc/specialist + +/datum/equipment_preset/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/under/marine/veteran/royal_marine, WEAR_BODY) + 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/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/storage/belt/marine/rmc/rmc_f90_ammo, WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/royal_marine, WEAR_HANDS) + 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/shoes/veteran/royal_marine/knife, WEAR_FEET) + // + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/rmc/medium, WEAR_BACK) + 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/storage/firstaid/regular, 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/tool/crowbar/tactical, WEAR_IN_JACKET) + 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/surgical_line, 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/weapon/gun/rifle/rmc_f90/shotgun, WEAR_J_STORE) + // + 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/clothing/accessory/storage/droppouch, WEAR_ACCESSORY) + 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/mask/gas/pmc/royal_marine, WEAR_FACE) + +//*****************************************************************************************************/ +/datum/equipment_preset/royal_marine/spec/machinegun + name = "RMC TWE Royal Marine Commando (Smartgunner)" + paygrade = "TC2" + role_comm_title = "RMC" + flags = EQUIPMENT_PRESET_EXTRA + assignment = "Royal Marine Smartgunner" + rank = JOB_TWE_RMC_SPECIALIST + skills = /datum/skills/rmc/specialist + +/datum/equipment_preset/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/under/marine/veteran/royal_marine, WEAR_BODY) + 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/suit/storage/marine/veteran/royal_marine/medium, 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/storage/belt/gun/l905/full, WEAR_WAIST) + new_human.equip_to_slot_or_del(new /obj/item/clothing/gloves/marine/veteran/royal_marine, WEAR_HANDS) + 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/shoes/veteran/royal_marine/knife, WEAR_FEET) + // + new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/rmc/medium, WEAR_BACK) + 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/storage/firstaid/regular, 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/tool/crowbar/tactical, WEAR_IN_JACKET) + 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/surgical_line, 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/weapon/gun/smartgun/rmc, WEAR_J_STORE) + // + 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/clothing/accessory/storage/droppouch, WEAR_ACCESSORY) + 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/mask/gas/pmc/royal_marine, WEAR_FACE) + new_human.equip_to_slot(new /obj/item/smartgun_battery(new_human), WEAR_IN_BACK) //*****************************************************************************************************/ /datum/equipment_preset/royal_marine/team_leader - name = "Military Contractor (Engineer)" - paygrade = "SGT" + name = "RMC TWE Royal Marine Commando (Teamleader)" + paygrade = "TC4" role_comm_title = "RMC" flags = EQUIPMENT_PRESET_EXTRA assignment = "Royal Marine Team Leader" rank = JOB_TWE_RMC_TEAMLEADER - skills = /datum/skills/pmc/SL + skills = /datum/skills/rmc/leader /datum/equipment_preset/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/under/marine/veteran/royal_marine, WEAR_BODY) + 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/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/suit/storage/marine/veteran/royal_marine/light, WEAR_JACKET) + 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/storage/belt/marine/royal_marine/rmc_f90_ammo, WEAR_WAIST) + 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/clothing/gloves/marine/veteran/royal_marine, WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/royal_marine, WEAR_HEAD) + 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/shoes/veteran/royal_marine/knife, WEAR_FEET) // - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack, WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge, WEAR_IN_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/explosive/plastic/breaching_charge, WEAR_IN_JACKET) new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar/tactical, 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/tool/crowbar/tactical, WEAR_IN_JACKET) + 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/surgical_line, 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/weapon/gun/rifle/rmc_f90/a_grip, WEAR_J_STORE) // @@ -199,35 +301,46 @@ 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/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/head/helmet/marine/veteran/royal_marine/team_lead, WEAR_IN_ACCESSORY) new_human.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/pmc/royal_marine, WEAR_IN_ACCESSORY) //*****************************************************************************************************/ /datum/equipment_preset/royal_marine/lieuteant //they better say it Lef-tenant or they should be banned for LRP - name = "Military Contractor (Leader)" - paygrade = "VAI-L" - role_comm_title = "LT" + name = "RMC TWE Royal Marine Commando (Officer)" + paygrade = "TO1" + role_comm_title = "RMC" flags = EQUIPMENT_PRESET_EXTRA assignment = "Royal Marine Officer" rank = JOB_TWE_RMC_LIEUTENANT - skills = /datum/skills/pmc/SL + skills = /datum/skills/rmc/leader /datum/equipment_preset/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/under/marine/veteran/royal_marine, WEAR_BODY) + 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/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/suit/storage/marine/veteran/royal_marine/light, WEAR_JACKET) + 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/storage/belt/marine/royal_marine/rmc_f90_ammo, WEAR_WAIST) + 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/clothing/gloves/marine/veteran/royal_marine, WEAR_HANDS) - new_human.equip_to_slot_or_del(new /obj/item/clothing/head/beret/royal_marine, WEAR_HEAD) + 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/shoes/veteran/royal_marine/knife, WEAR_FEET) // - new_human.equip_to_slot_or_del(new /obj/item/storage/backpack/lightpack, WEAR_BACK) - new_human.equip_to_slot_or_del(new /obj/item/explosive/plastic/breaching_charge, WEAR_IN_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/explosive/plastic/breaching_charge, WEAR_IN_JACKET) new_human.equip_to_slot_or_del(new /obj/item/storage/firstaid/regular, WEAR_IN_BACK) - new_human.equip_to_slot_or_del(new /obj/item/tool/crowbar/tactical, 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/tool/crowbar/tactical, WEAR_IN_JACKET) + 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/surgical_line, 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/ammo_magazine/rifle/rmc_f90, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/rmc_f90, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/rmc_f90, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/rmc_f90, WEAR_IN_BACK) + new_human.equip_to_slot_or_del(new /obj/item/ammo_magazine/rifle/rmc_f90, WEAR_IN_BACK) // new_human.equip_to_slot_or_del(new /obj/item/weapon/gun/rifle/rmc_f90/a_grip, WEAR_J_STORE) // diff --git a/code/modules/mob/living/say.dm b/code/modules/mob/living/say.dm index 58b9f3d2c3b6..441a7b5b2c28 100644 --- a/code/modules/mob/living/say.dm +++ b/code/modules/mob/living/say.dm @@ -22,6 +22,7 @@ var/list/department_radio_keys = list( ":o" = RADIO_CHANNEL_COLONY, ".o" = RADIO_CHANNEL_COLONY, "#o" = RADIO_CHANNEL_PMC_CCT, ":z" = RADIO_CHANNEL_HIGHCOM, ".z" = RADIO_CHANNEL_HIGHCOM, "#z" = RADIO_CHANNEL_PMC_CMD, ":k" = SQUAD_SOF, ".k" = SQUAD_SOF, "#k" = RADIO_CHANNEL_WY_WO, + ":x" = RADIO_CHANNEL_ROYAL_MARINE, ".x" = RADIO_CHANNEL_ROYAL_MARINE, ":I" = RADIO_CHANNEL_INTERCOM, ".I" = RADIO_CHANNEL_INTERCOM, "#I" = RADIO_CHANNEL_INTERCOM, ":H" = RADIO_CHANNEL_DEPARTMENT, ".H" = RADIO_CHANNEL_DEPARTMENT, "#H" = RADIO_CHANNEL_DEPARTMENT, diff --git a/code/modules/projectiles/ammo_datums.dm b/code/modules/projectiles/ammo_datums.dm index ff7a25754a82..c8ebd4612732 100644 --- a/code/modules/projectiles/ammo_datums.dm +++ b/code/modules/projectiles/ammo_datums.dm @@ -1775,6 +1775,25 @@ penetration = ARMOR_PENETRATION_TIER_7 damage_armor_punch = 3 +/datum/ammo/bullet/smartgun/holo_target //we use this for the RMC smartgun that has a support ammo instead of AP + name = "holo-targeting smartgun bullet" + damage = 30 + var/holo_stacks = 15 + +/datum/ammo/bullet/smartgun/holo_target/on_hit_mob(mob/M, obj/item/projectile/P) + . = ..() + M.AddComponent(/datum/component/bonus_damage_stack, holo_stacks, world.time) + +/datum/ammo/bullet/smartgun/holo_target/ap + name = "armor-piercing smartgun bullet" + icon_state = "bullet" + + accurate_range = 12 + accuracy = HIT_ACCURACY_TIER_2 + damage = 20 + penetration = ARMOR_PENETRATION_TIER_8 + damage_armor_punch = 1 + /datum/ammo/bullet/smartgun/m56_fpw name = "\improper M56 FPW bullet" icon_state = "redbullet" diff --git a/code/modules/projectiles/gun_attachables.dm b/code/modules/projectiles/gun_attachables.dm index 1da70d487f76..8cbebf094940 100644 --- a/code/modules/projectiles/gun_attachables.dm +++ b/code/modules/projectiles/gun_attachables.dm @@ -331,6 +331,17 @@ Defined in conflicts.dm of the #defines folder. attach_icon = "co2_bayonet_a" var/filled = FALSE +/obj/item/attachable/bayonet/rmc + name = "\improper L5 bayonet" + desc = "The standard-issue bayonet of the RMC, the L5 is balanced to also function as an effective throwing knife." + icon_state = "upp_bayonet" // PLACEHOLDER PLEASE REPLACE + item_state = "combat_knife" + attach_icon = "upp_bayonet_a" // PLACEHOLDER PLEASE REPLACE + throwforce = MELEE_FORCE_TIER_10 //doubled by throwspeed to 100 + throw_speed = SPEED_REALLY_FAST + throw_range = 7 + pry_delay = 1 SECONDS + /obj/item/attachable/bayonet/co2/update_icon() icon_state = "co2_knife[filled ? "-f" : ""]" attach_icon = "co2_bayonet[filled ? "-f" : ""]_a" @@ -458,6 +469,17 @@ Defined in conflicts.dm of the #defines folder. melee_mod = 0 //Integrated attachment for visuals, stats handled on main gun. size_mod = 0 +/obj/item/attachable/l56a2_smartgun + name = "l56a2 barrel" + desc = "This isn't supposed to be seperated from the gun, how'd this happen?" + icon_state = "magsg_barrel_a" + attach_icon = "magsg_barrel_a" + slot = "muzzle" + wield_delay_mod = WIELD_DELAY_NONE + flags_attach_features = NO_FLAGS + melee_mod = 0 //Integrated attachment for visuals, stats handled on main gun. + size_mod = 0 + /obj/item/attachable/sniperbarrel name = "sniper barrel" icon = 'icons/obj/items/weapons/guns/attachments/barrel.dmi' diff --git a/code/modules/projectiles/guns/rifles.dm b/code/modules/projectiles/guns/rifles.dm index 145688029577..68d80d8dc2fd 100644 --- a/code/modules/projectiles/guns/rifles.dm +++ b/code/modules/projectiles/guns/rifles.dm @@ -1693,8 +1693,8 @@ //=ROYAL MARINES=\\ /obj/item/weapon/gun/rifle/rmc_f90 - name = "\improper RMC F903WE" - desc = "The standard issue rifle of the royal marines. Commonly carried by most combat personnel. Uses 10x24mm caseless ammunition." + name = "\improper F903A1 Rifle" + desc = "The standard issue rifle of the royal marines. Uniquely the royal marines are the only modern military to not use a pulse weapon. Uses 10x24mm caseless ammunition." icon = 'icons/obj/items/weapons/guns/guns_by_faction/twe_guns.dmi' icon_state = "aug" item_state = "aug" @@ -1736,8 +1736,8 @@ recoil_unwielded = RECOIL_AMOUNT_TIER_2 /obj/item/weapon/gun/rifle/rmc_f90/a_grip - name = "\improper RMC F903WE" - desc = "..." + name = "\improper F903A2 Rifle" + desc = "A non-standard issue rifle of the royal marines the F903A2 is currently being phased into the royal marines as their new mainline rifle but currently only sees use by unit leaders. Uniquely the royal marines are the only modern military to not use a pulse weapon. Uses 10x24mm caseless ammunition." icon_state = "aug_com" item_state = "aug_com" attachable_allowed = list( @@ -1756,8 +1756,8 @@ update_attachable(f90_agrip.slot) /obj/item/weapon/gun/rifle/rmc_f90/scope - name = "\improper RMC F903WE" - desc = "..." + name = "\improper F903A1 Marksman Rifle" + desc = "A variation of the F903 rifle used by the royal marines commando. This weapon only accepts the smaller 15 round magazines of 10x24mm HVAP." icon_state = "aug_dmr" item_state = "aug_dmr" attachable_allowed = null @@ -1794,8 +1794,7 @@ update_attachable(f90_dmr_barrel.slot) /obj/item/weapon/gun/rifle/rmc_f90/shotgun - name = "\improper RMC F903WE" - desc = "..." + name = "\improper F903A1 Breacher Rifle" icon_state = "aug_mkey" item_state = "aug_mkey" attachable_allowed = list( diff --git a/code/modules/projectiles/guns/smartgun.dm b/code/modules/projectiles/guns/smartgun.dm index 859f99b17908..7d0c9c16c295 100644 --- a/code/modules/projectiles/guns/smartgun.dm +++ b/code/modules/projectiles/guns/smartgun.dm @@ -735,3 +735,28 @@ . = ..() . += SPAN_NOTICE("The power indicator reads [power_cell.charge] charge out of [power_cell.maxcharge] total.") + +/obj/item/weapon/gun/smartgun/rmc + name = "\improper L56A2 smartgun" + desc = "The actual firearm in the 2-piece L56A2 Smartgun System. This Variant is used by the Three World Empires Royal Marines Commando units.\nYou may toggle firing restrictions by using a special action.\nAlt-click it to open the feed cover and allow for reloading." + current_mag = /obj/item/ammo_magazine/smartgun/holo_targetting + ammo = /obj/item/ammo_magazine/smartgun/holo_targetting + ammo_primary = /datum/ammo/bullet/smartgun/holo_target //Toggled ammo type + ammo_secondary = /datum/ammo/bullet/smartgun/holo_target/ap ///Toggled ammo type + flags_gun_features = GUN_SPECIALIST|GUN_WIELDED_FIRING_ONLY + icon = 'icons/obj/items/weapons/guns/guns_by_faction/twe_guns.dmi' + icon_state = "magsg" + item_state = "magsg" + +/obj/item/weapon/gun/smartgun/rmc/Initialize(mapload, ...) + . = ..() + MD.iff_signal = FACTION_TWE + + +/obj/item/weapon/gun/smartgun/rmc/handle_starting_attachment() + ..() + var/obj/item/attachable/l56a2_smartgun/l56a2_barrel = new(src) + l56a2_barrel.flags_attach_features &= ~ATTACH_REMOVABLE + l56a2_barrel.hidden = FALSE + l56a2_barrel.Attach(src) + update_attachable(l56a2_barrel.slot) diff --git a/code/modules/projectiles/magazines/rifles.dm b/code/modules/projectiles/magazines/rifles.dm index 5eda2662a227..626ca9c2ee52 100644 --- a/code/modules/projectiles/magazines/rifles.dm +++ b/code/modules/projectiles/magazines/rifles.dm @@ -449,7 +449,7 @@ //=ROYAL MARINES=\\ /obj/item/ammo_magazine/rifle/rmc_f90 - name = "\improper RMC F90 HV magazine (10x24mm)" + name = "\improper F903 HV magazine (10x24mm)" desc = "A 10mm high velocity assault rifle magazine used by the royal marines." caliber = "10x24mm" icon = 'icons/obj/items/weapons/guns/ammo_by_faction/twe_ammo.dmi' @@ -463,7 +463,7 @@ ammo_band_icon_empty = "+m41a_band_e" /obj/item/ammo_magazine/rifle/rmc_f90/marksman - name = "\improper RMC F90 HVAP magazine (10x24mm)" + name = "\improper F903A1 Marksman HVAP magazine (10x24mm)" desc = "A 10mm high velocity armor-piercing assault rifle magazine used by the royal marines." icon_state = "aug_dmr" item_state = "aug_dmr" diff --git a/code/modules/projectiles/magazines/specialist.dm b/code/modules/projectiles/magazines/specialist.dm index 23b540202c40..b6f2bbde0ff5 100644 --- a/code/modules/projectiles/magazines/specialist.dm +++ b/code/modules/projectiles/magazines/specialist.dm @@ -107,6 +107,12 @@ default_ammo = /datum/ammo/bullet/smartgun/dirty gun_type = /obj/item/weapon/gun/smartgun/dirty +/obj/item/ammo_magazine/smartgun/holo_targetting + name = "holotargetting smartgun drum" + desc = "Holotargetting rounds for use in the royal marines commandos LX smartgun" + icon_state = "m56_drum_dirty" + default_ammo = /datum/ammo/bullet/smartgun/holo_target + gun_type = /obj/item/weapon/gun/smartgun/rmc //------------------------------------------------------- //Flare gun. Close enough? /obj/item/ammo_magazine/internal/flare diff --git a/code/modules/shuttle/shuttles/ert.dm b/code/modules/shuttle/shuttles/ert.dm index 2868dc4a237b..1760caf3d87c 100644 --- a/code/modules/shuttle/shuttles/ert.dm +++ b/code/modules/shuttle/shuttles/ert.dm @@ -105,6 +105,13 @@ port_direction = NORTH // ERT Shuttle 4 + +/obj/docking_port/mobile/emergency_response/ert4 + name = "TWE Shuttle" + id = MOBILE_SHUTTLE_ID_ERT4 + preferred_direction = SOUTH + port_direction = NORTH + /obj/docking_port/mobile/emergency_response/small name = "Rescue Shuttle" id = MOBILE_SHUTTLE_ID_ERT_SMALL @@ -115,6 +122,7 @@ var/port_door var/starboard_door + /obj/docking_port/mobile/emergency_response/small/Initialize(mapload) . = ..() external_doors = list() @@ -293,6 +301,14 @@ height = 29 roundstart_template = /datum/map_template/shuttle/big_ert +/obj/docking_port/stationary/emergency_response/idle_port6 + name = "Response Station Landing Pad 6" + dir = NORTH + id = ADMIN_LANDING_PAD_5 + width = 17 + height = 29 + roundstart_template = /datum/map_template/shuttle/twe_ert + /datum/map_template/shuttle/response_ert name = "Response Shuttle" shuttle_id = "ert_response_shuttle" @@ -305,6 +321,10 @@ name = "UPP Shuttle" shuttle_id = "ert_upp_shuttle" +/datum/map_template/shuttle/twe_ert + name = "TWE Shuttle" + shuttle_id = "ert_twe_shuttle" + /datum/map_template/shuttle/small_ert name = "Rescue Shuttle" shuttle_id = "ert_small_shuttle_north" diff --git a/icons/mob/humans/onmob/back.dmi b/icons/mob/humans/onmob/back.dmi index 5e6e3a322b82..6ad8b4b6c6da 100644 Binary files a/icons/mob/humans/onmob/back.dmi and b/icons/mob/humans/onmob/back.dmi differ diff --git a/icons/mob/humans/onmob/belt.dmi b/icons/mob/humans/onmob/belt.dmi index f95ba65ece52..8a10910930dd 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 444a5ac44510..8b9b03bc855d 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/mask.dmi b/icons/mob/humans/onmob/mask.dmi index 6d485caf8f50..1a9f85254084 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 3ed600292661..0f15dfd9dd62 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/ties.dmi b/icons/mob/humans/onmob/ties.dmi index b9ffbdd61ca4..b5e54570167d 100644 Binary files a/icons/mob/humans/onmob/ties.dmi and b/icons/mob/humans/onmob/ties.dmi differ diff --git a/icons/mob/humans/onmob/uniform_0.dmi b/icons/mob/humans/onmob/uniform_0.dmi index dd88329d5045..ccec177b9f53 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/backpacks.dmi b/icons/obj/items/clothing/backpacks.dmi index f84cbcafc152..e9e2e8b6fff8 100644 Binary files a/icons/obj/items/clothing/backpacks.dmi and b/icons/obj/items/clothing/backpacks.dmi differ diff --git a/icons/obj/items/clothing/belts.dmi b/icons/obj/items/clothing/belts.dmi index 381dcbe9687a..4b219829dabc 100644 Binary files a/icons/obj/items/clothing/belts.dmi and b/icons/obj/items/clothing/belts.dmi differ diff --git a/icons/obj/items/clothing/cm_hats.dmi b/icons/obj/items/clothing/cm_hats.dmi index 1f7913deb900..6c27dc6eb4b9 100644 Binary files a/icons/obj/items/clothing/cm_hats.dmi and b/icons/obj/items/clothing/cm_hats.dmi differ diff --git a/icons/obj/items/clothing/cm_suits.dmi b/icons/obj/items/clothing/cm_suits.dmi index de4625228559..db0ca6f06237 100644 Binary files a/icons/obj/items/clothing/cm_suits.dmi and b/icons/obj/items/clothing/cm_suits.dmi differ diff --git a/icons/obj/items/clothing/masks.dmi b/icons/obj/items/clothing/masks.dmi index 6902ba27bf65..90a1e3bfd892 100644 Binary files a/icons/obj/items/clothing/masks.dmi and b/icons/obj/items/clothing/masks.dmi differ diff --git a/icons/obj/items/clothing/ties.dmi b/icons/obj/items/clothing/ties.dmi index 4f5a3777ab10..9d2677fe9b19 100644 Binary files a/icons/obj/items/clothing/ties.dmi and b/icons/obj/items/clothing/ties.dmi differ diff --git a/icons/obj/items/clothing/uniforms.dmi b/icons/obj/items/clothing/uniforms.dmi index 8d8acb66505d..f01db413cb7a 100644 Binary files a/icons/obj/items/clothing/uniforms.dmi and b/icons/obj/items/clothing/uniforms.dmi differ diff --git a/icons/obj/items/weapons/guns/attachments/barrel.dmi b/icons/obj/items/weapons/guns/attachments/barrel.dmi index e04f5c2619cb..40484a74fe01 100644 Binary files a/icons/obj/items/weapons/guns/attachments/barrel.dmi and b/icons/obj/items/weapons/guns/attachments/barrel.dmi differ diff --git a/icons/obj/items/weapons/guns/guns_by_faction/twe_guns.dmi b/icons/obj/items/weapons/guns/guns_by_faction/twe_guns.dmi index 6537232abb6d..243e1b39d617 100644 Binary files a/icons/obj/items/weapons/guns/guns_by_faction/twe_guns.dmi and b/icons/obj/items/weapons/guns/guns_by_faction/twe_guns.dmi differ diff --git a/icons/turf/ert_shuttle.dmi b/icons/turf/ert_shuttle.dmi index 2a9627a77094..225104f75b7d 100644 Binary files a/icons/turf/ert_shuttle.dmi and b/icons/turf/ert_shuttle.dmi differ diff --git a/maps/map_files/generic/Admin_level.dmm b/maps/map_files/generic/Admin_level.dmm index 8dd8e17e6507..43b3d26ec3f9 100644 --- a/maps/map_files/generic/Admin_level.dmm +++ b/maps/map_files/generic/Admin_level.dmm @@ -219,8 +219,15 @@ /turf/open/floor/carpet, /area/centcom/living) "eA" = ( -/obj/structure/sign/poster/pinup, -/turf/closed/wall/r_wall/unmeltable, +/obj/effect/decal/warning_stripes{ + icon_state = "N" + }, +/obj/structure/machinery/door_control{ + id = "ERT Lock Big"; + name = "Hangar Lock"; + pixel_y = -32 + }, +/turf/open/floor/plating/almayer, /area/adminlevel/ert_station) "eE" = ( /turf/open/floor/carpet/edge{ @@ -735,14 +742,15 @@ /turf/open/floor/carpet, /area/centcom/living) "tP" = ( -/obj/structure/machinery/computer/cameras/wooden_tv{ - desc = "An old TV hooked up to a video cassette recorder, you can even use it to time shift WOW."; - name = "Television set"; - network = null; - pixel_x = -4; - pixel_y = 2 +/obj/effect/decal/warning_stripes{ + icon_state = "E" }, -/turf/closed/wall/r_wall/unmeltable, +/obj/structure/machinery/door_control{ + id = "ERT Lock 4"; + name = "Hangar Lock"; + pixel_x = -24 + }, +/turf/open/floor/plating/almayer, /area/adminlevel/ert_station) "tY" = ( /obj/structure/machinery/washing_machine, @@ -785,6 +793,10 @@ icon_state = "kitchen" }, /area/adminlevel/ert_station) +"ur" = ( +/obj/docking_port/stationary/emergency_response/idle_port6, +/turf/open/floor/plating, +/area/adminlevel/ert_station) "uI" = ( /turf/open/floor/almayer{ icon_state = "red" @@ -1383,8 +1395,8 @@ }, /obj/structure/machinery/door/poddoor/almayer{ dir = 4; - unacidable = 1; - id = "ERT Lock 1" + id = "ERT Lock 1"; + unacidable = 1 }, /turf/open/floor/almayer{ icon_state = "tcomms" @@ -1646,21 +1658,6 @@ icon_state = "greencorner" }, /area/adminlevel/ert_station) -"KH" = ( -/obj/structure/machinery/door/airlock/almayer/generic{ - damage_cap = 50000; - name = "\improper Hangar"; - no_panel = 1 - }, -/obj/structure/machinery/door/poddoor/almayer{ - dir = 4; - unacidable = 1; - id = "ERT Lock Big" - }, -/turf/open/floor/almayer{ - icon_state = "tcomms" - }, -/area/adminlevel/ert_station) "KM" = ( /obj/structure/bed/chair{ dir = 4 @@ -1821,9 +1818,18 @@ /turf/open/floor/plating/almayer, /area/adminlevel/ert_station/shuttle_dispatch) "Ni" = ( -/obj/structure/curtain/open/shower, +/obj/structure/machinery/door/airlock/almayer/generic{ + damage_cap = 50000; + name = "\improper Hangar"; + no_panel = 1 + }, +/obj/structure/machinery/door/poddoor/almayer{ + dir = 4; + id = "ERT Lock 4"; + unacidable = 1 + }, /turf/open/floor/almayer{ - icon_state = "dark_sterile" + icon_state = "tcomms" }, /area/adminlevel/ert_station) "Nk" = ( @@ -1881,8 +1887,8 @@ }, /obj/structure/machinery/door/poddoor/almayer{ dir = 4; - unacidable = 1; - id = "ERT Lock 3" + id = "ERT Lock 3"; + unacidable = 1 }, /turf/open/floor/almayer{ icon_state = "tcomms" @@ -2094,13 +2100,9 @@ }, /area/tdome) "Sk" = ( -/obj/effect/decal/warning_stripes{ - icon_state = "E" - }, -/obj/structure/machinery/door_control{ +/obj/structure/machinery/door/poddoor/almayer{ id = "ERT Lock Big"; - name = "Hangar Lock"; - pixel_x = -24 + unacidable = 1 }, /turf/open/floor/plating/almayer, /area/adminlevel/ert_station) @@ -2305,13 +2307,6 @@ }, /turf/open/floor/plating/almayer, /area/adminlevel/ert_station/shuttle_dispatch) -"Vu" = ( -/obj/structure/machinery/shower, -/obj/item/tool/soap/syndie, -/turf/open/floor/almayer{ - icon_state = "dark_sterile" - }, -/area/adminlevel/ert_station) "VC" = ( /obj/structure/sign/poster/clf, /turf/closed/wall, @@ -2565,8 +2560,8 @@ }, /obj/structure/machinery/door/poddoor/almayer{ dir = 4; - unacidable = 1; - id = "ERT Lock 2" + id = "ERT Lock 2"; + unacidable = 1 }, /turf/open/floor/almayer{ icon_state = "tcomms" @@ -2613,6 +2608,11 @@ aa aa aa aa +as +as +as +as +as aa aa aa @@ -2637,29 +2637,24 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as aa aa aa @@ -2770,24 +2765,6 @@ as as as as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as aa aa aa @@ -2812,11 +2789,29 @@ aC aa aa aa -aa -aa -aa -aa -aa +as +TT +TT +TT +TT +TT +TT +TT +TT +TT +TT +TT +TT +TT +TT +TT +TT +TT +aC +aC +aC +aC +aC aC aC aC @@ -2922,24 +2917,6 @@ as as as as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as aa aa aa @@ -2964,12 +2941,30 @@ aC aC aa aa +as +TT +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +aa aa aa aa aa aa -aC aa aa aa @@ -3074,24 +3069,6 @@ as as as as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as aa aa aa @@ -3116,18 +3093,36 @@ aa aC aa aa -aa -aa -aa -aa -aa -aC -aa +as +TT +as +wW +wW +wW wW wW wW wW wW +Ch +wW +wW +wW +wW +wW +wW +wW +wW +wW +wW +wW +wW +wW +hZ +wW +wW +wW +wW wW wW wW @@ -3226,24 +3221,6 @@ as as as as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as aa aa aa @@ -3268,13 +3245,31 @@ aa aC aa aa -aa -aa -aa -aa -aa -aC -aa +as +TT +as +wW +Ya +Ly +Ly +Ly +Ly +Ly +Ly +Ly +Ly +Ly +Ly +Ly +Ly +Ly +Ly +Ly +Ly +Ly +Ly +Ly +Ya wW Ya Ly @@ -3378,24 +3373,6 @@ as as as as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as aa aa aa @@ -3420,13 +3397,31 @@ aa aC aa aa -aa -aa -aa -aa -aa -aC -aa +as +TT +as +wW +KW +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +Fo wW KW FB @@ -3530,24 +3525,6 @@ as as as as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as aa aa aa @@ -3572,13 +3549,31 @@ aa aC aa aa -aa -aa -aa -aa -aa -aC -aa +as +TT +as +wW +KW +FB +FB +FB +FB +FB +FB +FB +FB +FB +Jl +FB +FB +FB +FB +FB +FB +FB +FB +FB +Fo wW KW FB @@ -3682,24 +3677,6 @@ as as as as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as aa aa aa @@ -3724,13 +3701,31 @@ aa aC aa aa -aa -aa -aa -aa -aa -aC -aa +as +TT +as +wW +KW +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +Fo wW KW FB @@ -3834,24 +3829,6 @@ as as as as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as aa aa aa @@ -3876,13 +3853,31 @@ aa aC aC aa -aa -aa -aa -aa -aa -aC -aa +as +TT +as +wW +KW +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +Fo wW KW FB @@ -3986,24 +3981,6 @@ as as as as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as aa aa aa @@ -4028,13 +4005,31 @@ aa aa aC aa -aa -aa -aa -aa -aa -aC -aa +as +TT +as +wW +KW +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +Fo wW KW FB @@ -4138,24 +4133,6 @@ as as as as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as aa aa aa @@ -4180,13 +4157,31 @@ ab aa aC aC -aa -aa -aa -aa -aa -aC -aa +as +TT +as +wW +KW +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +Fo wW KW FB @@ -4290,24 +4285,6 @@ as as as as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as aa aa aa @@ -4332,13 +4309,31 @@ ab aa aa aC -aa -aa -aa -aa -aa -aC -aa +as +TT +as +wW +KW +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +Fo wW KW FB @@ -4442,24 +4437,6 @@ as as as as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as aa aa aa @@ -4484,13 +4461,31 @@ ab ab aa aC -aa -aa -aa -aa -aa -aC -aa +as +TT +as +wW +KW +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +Fo wW KW FB @@ -4594,24 +4589,6 @@ as as as as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as aa aa aa @@ -4636,13 +4613,31 @@ ad ab aa aC -aa -aa -aa -aa -aa -aC -aa +as +TT +as +wW +KW +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +Fo wW KW FB @@ -4746,24 +4741,6 @@ as as as as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as aa aa aa @@ -4788,13 +4765,31 @@ ad ab aa aC -aa -aa -aa -aa -aa -aC -aa +as +TT +as +wW +KW +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +Fo wW Ya Js @@ -4898,24 +4893,6 @@ as as as as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as aa aC aC @@ -4940,13 +4917,31 @@ ad ab aa aC -aa -aa -aa -aa -aa -aC -aa +as +TT +as +wW +KW +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +Fo wW wW wW @@ -5050,24 +5045,6 @@ as as as as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as aa aC aa @@ -5092,14 +5069,32 @@ ad ab aa aC -aa -aa -aa -aa -aa -aC -aa -eA +as +TT +as +wW +KW +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +Fo +wW va ug AL @@ -5202,24 +5197,6 @@ as as as as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as aa aC aa @@ -5244,13 +5221,31 @@ ad ab aa aC -aa -aa -aa -aa -aa -aC -aa +as +TT +as +wW +KW +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +Fo wW YU YU @@ -5354,24 +5349,6 @@ as as as as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as aa aC aa @@ -5396,16 +5373,34 @@ ad ab aa aC -aa -aa -aa -aa -aa -aC -aa +as +TT +as wW -Vu -Ni +KW +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +Fo +Sk +AL +AL AL AL AL @@ -5506,24 +5501,6 @@ as as as as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as aa aC aa @@ -5548,14 +5525,32 @@ ad ab aa aC -aa -aa -aa -aa -aa -aC -aa -wW +as +TT +as +wW +KW +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +eA +wW YU YU YU @@ -5658,24 +5653,6 @@ as as as as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as aa aC aa @@ -5700,13 +5677,31 @@ ad ab aa aC -aa -aa -aa -aa -aa -aC -aa +as +TT +as +wW +KW +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +Fo wW BV Gr @@ -5810,24 +5805,6 @@ as as as as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as aa aC aa @@ -5852,13 +5829,31 @@ ad ab aa aC -aa -aa -aa -aa -aa -aC -aa +as +TT +as +wW +KW +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +Fo wW uk CU @@ -5962,24 +5957,6 @@ as as as as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as aa aC aa @@ -6004,13 +5981,31 @@ ad ab aa aC -aa -aa -aa -aa -aa -aC -aa +as +TT +as +wW +KW +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +Fo wW yk CU @@ -6114,24 +6109,6 @@ as as as as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as aa aC aa @@ -6156,13 +6133,31 @@ ad ab aa aC -aa -aa -aa -aa -aa -aC -aa +as +TT +as +wW +KW +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +Fo wW yC CU @@ -6266,24 +6261,6 @@ as as as as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as aa aC aa @@ -6308,16 +6285,34 @@ ad ab aa aC -aa -aa -aa -aa -aa -aC -aa +as +TT +as wW -yQ -CU +KW +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +Fo +wW +yQ +CU CU EI Iq @@ -6418,24 +6413,6 @@ as as as as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as aa aC aa @@ -6460,13 +6437,31 @@ ad ab aa aC -aa -aC -aC -aC -aC -aC -aa +as +TT +as +wW +KW +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +Fo wW zg CU @@ -6570,24 +6565,6 @@ as as as as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as aa aC aC @@ -6612,14 +6589,32 @@ ad ab aa aC -aa -aC -aa -aa -aa -aa -aa -tP +as +TT +as +wW +KW +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +Fo +wW zk CU CU @@ -6722,24 +6717,6 @@ as as as as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as aa aa aa @@ -6764,18 +6741,37 @@ ad ab aa aC -aa -aC -aa -wW +as +TT +as wW +KW +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +Fo wW wW wW wW wW wW -Ch wW wW wW @@ -6785,13 +6781,12 @@ wW wW wW Zw -KH +Ni Zw wW wW hZ wW -wW Zw Oa Zw @@ -6874,24 +6869,6 @@ as as as as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as aa aa aa @@ -6916,9 +6893,31 @@ ab ab aa aC -aa -aC -aa +as +TT +as +wW +KW +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +Fo wW Ya Ly @@ -6935,11 +6934,7 @@ Ly Ly Ly Ly -Ly -Ly -Ly -Sk -Ly +tP Ya wW Ya @@ -7026,24 +7021,6 @@ as as as as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as aa aa aa @@ -7068,9 +7045,9 @@ ab aa aa aC -aa -aC -aa +as +TT +as wW KW FB @@ -7112,11 +7089,29 @@ FB FB Fo wW -aa -aC -aa -aa -hp +KW +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +Fo +wW +aa +aC +aa +aa +hp hp hp hp @@ -7178,24 +7173,6 @@ as as as as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as aa aa aa @@ -7220,9 +7197,9 @@ ab aa aC aC -aa -aC -aa +as +TT +as wW KW FB @@ -7234,7 +7211,6 @@ FB FB FB FB -Jl FB FB FB @@ -7244,6 +7220,25 @@ FB FB FB FB +FB +Fo +wW +KW +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +ur +FB Fo wW KW @@ -7330,24 +7325,6 @@ as as as as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as aa aa aa @@ -7372,9 +7349,9 @@ aa aa aC aa -aa -aC -aa +as +TT +as wW KW FB @@ -7416,6 +7393,24 @@ FB FB Fo wW +KW +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +Fo +wW aa aC aa @@ -7482,24 +7477,6 @@ as as as as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as aa aa aa @@ -7524,9 +7501,9 @@ aa aC aC aa -aa -aC -aa +as +TT +as wW KW FB @@ -7568,6 +7545,24 @@ FB FB Fo wW +KW +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +Fo +wW aa aC aa @@ -7634,24 +7629,6 @@ as as as as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as aa aa aa @@ -7676,9 +7653,9 @@ aa aC aa aa -aa -aC -aa +as +TT +as wW KW FB @@ -7720,6 +7697,24 @@ FB FB Fo wW +KW +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +Fo +wW aa aC aa @@ -7786,24 +7781,6 @@ as as as as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as aa aa aa @@ -7828,9 +7805,9 @@ aa aC aa aa -aa -aC -aa +as +TT +as wW KW FB @@ -7872,6 +7849,24 @@ FB FB Fo wW +KW +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +Fo +wW aa aC aa @@ -7938,24 +7933,6 @@ as as as as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as aa aa aa @@ -7980,10 +7957,10 @@ aa aC aa aa -aa -aC -aa -wW +as +TT +as +wW KW FB FB @@ -8024,6 +8001,24 @@ FB FB Fo wW +KW +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +FB +Fo +wW aa aC aa @@ -8090,24 +8085,6 @@ as as as as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as aa aa aa @@ -8132,9 +8109,31 @@ aa aC aa aa -aa -aC -aa +as +TT +as +wW +Ya +Js +Js +Js +Js +Js +Js +Js +Js +Js +Js +Js +Js +Js +Js +Js +Js +Js +Js +Js +Ya wW KW FB @@ -8152,10 +8151,6 @@ FB FB FB FB -FB -FB -FB -FB Fo wW KW @@ -8242,24 +8237,6 @@ as as as as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as aa aa aa @@ -8284,9 +8261,31 @@ aa aC aa aa -aa -aC -aa +as +TT +as +wW +wW +wW +wW +wW +wW +wW +wW +wW +wW +wW +wW +wW +wW +wW +wW +wW +wW +wW +wW +wW +wW wW KW FB @@ -8304,10 +8303,6 @@ FB FB FB FB -FB -FB -FB -FB Fo wW KW @@ -8394,24 +8389,6 @@ as as as as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as -as aa aa aa @@ -8436,31 +8413,49 @@ aC aC aa aa +as +TT +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as aa -aC aa +aa +as +as +as +as wW -KW -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -Fo +Ya +Js +Js +Js +Js +Js +Js +Js +Js +Js +Js +Js +Js +Js +Js +Js +Ya wW Ya Js @@ -8541,29 +8536,11 @@ aa aa aa aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa +as +as +as +as +as aa aa aa @@ -8588,31 +8565,49 @@ aC aa aa aa -aa +as +TT +TT +TT +TT +TT +TT +TT +TT +TT +TT +TT +TT +TT +TT +TT +TT +TT aC -aa +aC +aC +TT +TT +TT +as +wW +wW +wW +wW +wW +wW +wW +wW +wW +wW +wW +wW +wW +wW +wW +wW +wW wW -KW -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -Fo wW wW wW @@ -8738,34 +8733,34 @@ aa aa aa aa -aa -aa -aa -aC -aa -wW -KW -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -Fo -wW +as +as +as +as +as +as +as +TT +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as aa aa aa @@ -8890,35 +8885,35 @@ aC aC aC aC -aa -aa -aa +as +as +as +as +as +as +as +TT +TT +TT +TT +TT +TT +TT +TT +TT +TT +TT +TT +TT +TT +TT +TT +TT +TT +TT +TT +TT aC -aa -wW -KW -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -Fo -wW -aa aC aC aC @@ -9042,36 +9037,36 @@ aa aa aa aC +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as aa aa aa -aC -aa -wW -KW -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -Fo -wW -aa -aC aa aa aa @@ -9175,55 +9170,55 @@ as as as aa -aC -aa -ds -ds -ds -ds -ds -ds -ds -ds -ds -ds -ds -ds -ds -ds -ds -aa -aC -aa -aa -aa -aC +aC +aa +ds +ds +ds +ds +ds +ds +ds +ds +ds +ds +ds +ds +ds +ds +ds +aa +aC +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +aa aa -wW -KW -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -Fo -wW aa -aC aa as as @@ -9349,33 +9344,33 @@ aC aa aa aa -aC aa -wW -KW -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -Fo -wW aa -aC +aa +aa +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +aa +as +as aa as as @@ -9498,36 +9493,36 @@ dy ds aa aC +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as aa -aa -aa -aC -aa -wW -KW -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -Fo -wW -aa -aC +as +as as as as @@ -9653,33 +9648,33 @@ aC aa aa aa -aC aa -wW -KW -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -Fo -wW aa -aC +aa +aa +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +aa +aa +as +as +as +as +as +as as as as @@ -9804,32 +9799,32 @@ aa aC aa aa +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as aa -aC aa -wW -KW -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -Fo -wW +as +as +as +as aa aC TT @@ -9956,32 +9951,32 @@ aa aC aa aa +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as aa -aC aa -wW -KW -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -Fo -wW +as +as +as +as aa TT as @@ -10108,32 +10103,32 @@ aa aC aa aa +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as aa -aC aa -wW -KW -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -Fo -wW +as +as +as +as aa aC as @@ -10261,31 +10256,31 @@ aC aa aa aa -aC aa -wW -KW -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -Fo -wW +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +as +as +as +as aa aC as @@ -10412,32 +10407,32 @@ aa aC aa aa +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +aa aa -aC aa -wW -KW -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -Fo -wW +as +as +as aa aC as @@ -10565,31 +10560,31 @@ aC aa aa aa -aC aa -wW -KW -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -Fo -wW +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +as +as +as aa aC as @@ -10717,31 +10712,31 @@ aC aa aa aa -aC +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +aa aa -wW -KW -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -Fo -wW +as +as +as aa aC as @@ -10869,31 +10864,31 @@ aC aa aa aa -aC +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as aa -wW -KW -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -Fo -wW +aa +as +as +as aa aC as @@ -11021,31 +11016,31 @@ aC aa aa aa -aC aa -wW -KW -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -Fo -wW +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +as +as +as aa aC as @@ -11173,31 +11168,31 @@ aC aa aa aa -aC +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as aa -wW -KW -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -Fo -wW +aa +as +as +as aa aC as @@ -11325,31 +11320,31 @@ aC aa aa aa -aC +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as aa -wW -KW -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -Fo -wW +aa +as +as +as aa aC as @@ -11477,31 +11472,31 @@ aC aa aa aa -aC -aa -wW -KW -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -Fo -wW +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +aa +aa +aa +aa +aa aa aC as @@ -11629,31 +11624,31 @@ aC aa aa aa -aC aa -wW -KW -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -FB -Fo -wW +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa aa aC as @@ -11781,31 +11776,31 @@ aa aa aa aa -aC aa -wW -Ya -Js -Js -Js -Js -Js -Js -Js -Js -Js -Js -Js -Js -Js -Js -Js -Js -Js -Js -Js -Ya -wW +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +aa +aa +aa +aa aa aC as @@ -11933,32 +11928,32 @@ aa aa aa aa -aC aa -wW -wW -wW -wW -wW -wW -wW -wW -wW -wW -wW -wW -wW -wW -wW -wW -wW -wW -wW -wW -wW -wW -wW +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as aa +aa +aa +as +as aC as Oi @@ -12085,32 +12080,32 @@ as as as aa -aC -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa -aa aa +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as +as aa aa aa +as +as aC as Oi @@ -12237,32 +12232,32 @@ as as as as -aC -aC -aC -aC -aC -aC -aC -aC -aC -aC -aC -aC -aC -aC -aC -aC -aC -aC -aC -aC -aC -aC -aC -aC -aC -aC +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +aa +as +as aC as as diff --git a/maps/shuttles/ert_twe_shuttle.dmm b/maps/shuttles/ert_twe_shuttle.dmm new file mode 100644 index 000000000000..4477b6a87cbf --- /dev/null +++ b/maps/shuttles/ert_twe_shuttle.dmm @@ -0,0 +1,325 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"a" = ( +/turf/open/shuttle/dropship{ + icon_state = "rasputin15" + }, +/area/shuttle/ert) +"b" = ( +/turf/closed/shuttle/ert{ + icon_state = "twe25" + }, +/area/shuttle/ert) +"e" = ( +/obj/effect/landmark/ert_spawns/distress_twe, +/turf/open/shuttle/dropship{ + icon_state = "rasputin3" + }, +/area/shuttle/ert) +"f" = ( +/turf/open/shuttle/dropship{ + icon_state = "rasputin3" + }, +/area/shuttle/ert) +"h" = ( +/turf/open/shuttle/dropship{ + icon_state = "floor8" + }, +/area/shuttle/ert) +"i" = ( +/turf/closed/shuttle/ert{ + icon_state = "twe3" + }, +/area/shuttle/ert) +"j" = ( +/turf/closed/shuttle/ert{ + icon_state = "twe23" + }, +/area/shuttle/ert) +"k" = ( +/turf/closed/shuttle/ert{ + icon_state = "rightengine_3"; + opacity = 0 + }, +/area/shuttle/ert) +"l" = ( +/turf/closed/shuttle/ert{ + icon_state = "leftengine_2"; + opacity = 0 + }, +/area/shuttle/ert) +"o" = ( +/turf/closed/shuttle/ert{ + icon_state = "twe1" + }, +/area/shuttle/ert) +"p" = ( +/turf/open/shuttle/dropship{ + icon_state = "rasputin8" + }, +/area/shuttle/ert) +"q" = ( +/obj/docking_port/mobile/emergency_response/ert4, +/turf/closed/shuttle/ert{ + icon_state = "leftengine_1"; + opacity = 0 + }, +/area/shuttle/ert) +"r" = ( +/obj/structure/blocker/invisible_wall, +/obj/structure/machinery/computer/shuttle/ert, +/turf/open/shuttle/dropship{ + icon_state = "rasputin15" + }, +/area/shuttle/ert) +"s" = ( +/turf/open/shuttle/dropship{ + icon_state = "rasputin7" + }, +/area/shuttle/ert) +"t" = ( +/obj/structure/surface/rack, +/obj/item/storage/firstaid/regular, +/obj/item/storage/belt/medical/lifesaver/full, +/obj/item/device/healthanalyzer, +/turf/open/shuttle/dropship{ + icon_state = "rasputin15" + }, +/area/shuttle/ert) +"v" = ( +/turf/closed/shuttle/ert{ + icon_state = "rightengine_2"; + opacity = 0 + }, +/area/shuttle/ert) +"x" = ( +/turf/closed/shuttle/ert{ + icon_state = "twe4" + }, +/area/shuttle/ert) +"y" = ( +/turf/closed/shuttle/ert{ + icon_state = "twe_leftengine" + }, +/area/shuttle/ert) +"z" = ( +/turf/closed/shuttle/ert{ + icon_state = "twe27" + }, +/area/shuttle/ert) +"A" = ( +/turf/closed/shuttle/ert{ + icon_state = "twe21" + }, +/area/shuttle/ert) +"D" = ( +/obj/structure/machinery/door/airlock/almayer/generic, +/turf/open/shuttle/dropship{ + icon_state = "rasputin3" + }, +/area/shuttle/ert) +"E" = ( +/turf/closed/shuttle/ert{ + icon_state = "twe22" + }, +/area/shuttle/ert) +"F" = ( +/turf/closed/shuttle/ert{ + icon_state = "twe8" + }, +/area/shuttle/ert) +"G" = ( +/turf/closed/shuttle/ert{ + icon_state = "twe2" + }, +/area/shuttle/ert) +"H" = ( +/obj/structure/bed/chair/dropship/passenger{ + dir = 8 + }, +/obj/effect/landmark/ert_spawns/distress_twe, +/turf/open/shuttle/dropship{ + icon_state = "rasputin15" + }, +/area/shuttle/ert) +"J" = ( +/turf/closed/shuttle/ert{ + icon_state = "twe_rightengine" + }, +/area/shuttle/ert) +"K" = ( +/turf/open/shuttle/dropship{ + icon_state = "rasputin4" + }, +/area/shuttle/ert) +"L" = ( +/turf/open/shuttle/dropship{ + icon_state = "rasputin6" + }, +/area/shuttle/ert) +"M" = ( +/obj/structure/machinery/door/airlock/almayer/generic{ + dir = 2 + }, +/turf/open/shuttle/dropship{ + icon_state = "rasputin15" + }, +/area/shuttle/ert) +"N" = ( +/turf/closed/shuttle/ert{ + icon_state = "twe5" + }, +/area/shuttle/ert) +"O" = ( +/turf/template_noop, +/area/template_noop) +"P" = ( +/obj/structure/bed/chair/dropship/passenger, +/obj/effect/landmark/ert_spawns/distress_twe, +/turf/open/shuttle/dropship{ + icon_state = "rasputin15" + }, +/area/shuttle/ert) +"T" = ( +/turf/closed/shuttle/ert{ + icon_state = "leftengine_3"; + opacity = 0 + }, +/area/shuttle/ert) +"U" = ( +/turf/closed/shuttle/ert{ + icon_state = "twe9" + }, +/area/shuttle/ert) +"V" = ( +/turf/closed/shuttle/ert{ + icon_state = "rightengine_1"; + opacity = 0 + }, +/area/shuttle/ert) +"W" = ( +/obj/structure/bed/chair/dropship/passenger{ + dir = 4 + }, +/obj/effect/landmark/ert_spawns/distress_twe, +/turf/open/shuttle/dropship{ + icon_state = "rasputin15" + }, +/area/shuttle/ert) +"X" = ( +/turf/closed/shuttle/ert{ + icon_state = "twe20" + }, +/area/shuttle/ert) +"Y" = ( +/obj/structure/surface/rack, +/obj/item/storage/toolbox/syndicate, +/turf/open/shuttle/dropship{ + icon_state = "rasputin15" + }, +/area/shuttle/ert) + +(1,1,1) = {" +O +X +x +D +x +x +x +D +x +y +T +l +q +"} +(2,1,1) = {" +O +A +Y +a +W +W +W +a +t +F +x +x +o +"} +(3,1,1) = {" +X +E +L +e +e +e +e +e +K +a +a +a +M +"} +(4,1,1) = {" +z +r +h +P +P +P +P +P +h +f +f +f +G +"} +(5,1,1) = {" +b +j +s +e +e +e +e +e +p +a +a +a +M +"} +(6,1,1) = {" +O +A +Y +a +H +H +H +a +t +U +N +N +i +"} +(7,1,1) = {" +O +b +N +D +N +N +N +D +N +J +k +v +V +"}