diff --git a/code/datums/emergency_calls/royal_marines.dm b/code/datums/emergency_calls/royal_marines.dm index dcab8011c1c0..99b6ea66429f 100644 --- a/code/datums/emergency_calls/royal_marines.dm +++ b/code/datums/emergency_calls/royal_marines.dm @@ -7,9 +7,6 @@ max_engineers = 0 max_medics = 0 max_heavies = 3 - var/max_synths = 1 - var/synths = 1 - /datum/emergency_call/royal_marines/New() ..() @@ -53,14 +50,8 @@ /datum/emergency_call/royal_marines/print_backstory(mob/living/carbon/human/M) - if(ishuman_strict(M)) - to_chat(M, SPAN_BOLD("You were born in the Three World Empire to a [pick_weight(list("average" = 75, "poor" = 15, "well-established" = 10))] 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 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 assigned to a Royal Marines base on mars to act as support personnel.")) - to_chat(M, SPAN_BOLD("Some months after your assignment, you were reassigned to the HMS Patna.")) + to_chat(M, SPAN_BOLD("You were born in the Three World Empire to a [pick_weight(list("average" = 75, "poor" = 15, "well-established" = 10))] family.")) + to_chat(M, SPAN_BOLD("Joining the Royal Marines gave you a lot of combat experience and useful skills.")) to_chat(M, SPAN_BOLD("You are [pick_weight(list("unaware" = 75, "faintly aware" = 15, "knoledgeable" = 10))] of the xenomorph threat.")) 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.")) @@ -75,7 +66,6 @@ max_medics = 0 max_heavies = 6 max_engineers = 0 - max_synths = 2 /obj/effect/landmark/ert_spawns/distress_twe name = "Distress_TWE" diff --git a/code/modules/gear_presets/royal_marines.dm b/code/modules/gear_presets/royal_marines.dm index debf39ccbe25..622f7a498210 100644 --- a/code/modules/gear_presets/royal_marines.dm +++ b/code/modules/gear_presets/royal_marines.dm @@ -51,6 +51,7 @@ 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 idtype = /obj/item/card/id/dogtag diff --git a/code/modules/projectiles/ammo_datums.dm b/code/modules/projectiles/ammo_datums.dm index c88024e324c8..12b8603bac21 100644 --- a/code/modules/projectiles/ammo_datums.dm +++ b/code/modules/projectiles/ammo_datums.dm @@ -1765,9 +1765,10 @@ penetration = ARMOR_PENETRATION_TIER_7 damage_armor_punch = 3 -/datum/ammo/bullet/smartgun/holo_target ///Royal marines smartgun bullet has only diff between regular ammo is this one does holostacks +/datum/ammo/bullet/smartgun/holo_target //Royal marines smartgun bullet has only diff between regular ammo is this one does holostacks name = "holo-targeting smartgun bullet" damage = 30 +///Stuff for the HRP holotargetting stacks var/holo_stacks = 15 /datum/ammo/bullet/smartgun/holo_target/on_hit_mob(mob/M, obj/item/projectile/P)