diff --git a/code/datums/ert/outsider.dm b/code/datums/ert/outsider.dm index d43e5b7f12e..680f4d308c2 100644 --- a/code/datums/ert/outsider.dm +++ b/code/datums/ert/outsider.dm @@ -2,6 +2,7 @@ name = "Independent Mercenaries" chance = 15 spawner = /datum/ghostspawner/human/ert/mercenary + equipment_map = /datum/map_template/distress_freelancers /datum/responseteam/kataphracts name = "Kataphracts" diff --git a/code/datums/outfits/ert/mercenary.dm b/code/datums/outfits/ert/mercenary.dm index 09aa3d20045..7d2145bdd0d 100644 --- a/code/datums/outfits/ert/mercenary.dm +++ b/code/datums/outfits/ert/mercenary.dm @@ -8,23 +8,28 @@ back = /obj/item/storage/backpack/satchel_norm l_hand = /obj/item/clothing/suit/space/void/freelancer r_hand = /obj/item/clothing/head/helmet/space/void/freelancer - accessory = /obj/item/clothing/accessory/storage/black_vest + accessory = /obj/item/clothing/accessory/holster/thigh + accessory_contents = list(/obj/item/gun/projectile/colt) id = /obj/item/card/id/syndicate + glasses = /obj/item/clothing/glasses/sunglasses/aviator + l_pocket = /obj/item/tank/emergency_oxygen/double l_ear = /obj/item/device/radio/headset/distress backpack_contents = list( - /obj/item/gun/projectile/automatic/c20r = 1, + /obj/item/storage/box/survival = 1, + /obj/item/gun/projectile/automatic/tommygun = 1, /obj/item/storage/belt/utility/full = 1, - /obj/item/tank/oxygen = 1, /obj/item/clothing/gloves/yellow = 1, - /obj/item/material/knife/trench = 1 ) belt_contents = list( - /obj/item/ammo_magazine/a10mm = 3, - /obj/item/handcuffs/ziptie = 2, - /obj/item/shield/energy = 1 + /obj/item/ammo_magazine/submachinedrum = 1, + /obj/item/ammo_magazine/submachinemag = 1, + /obj/item/ammo_magazine/c45m = 2, + /obj/item/handcuffs/ziptie = 1, + /obj/item/shield/energy = 1, + /obj/item/material/knife/trench = 1 ) /datum/outfit/admin/ert/mercenary/get_id_access() @@ -33,17 +38,18 @@ /datum/outfit/admin/ert/mercenary/specialist name = "Mercenary Freelancer Medic" + glasses = /obj/item/clothing/glasses/hud/health/aviator belt = /obj/item/storage/belt/medical/first_responder/combat gloves = /obj/item/clothing/gloves/latex backpack_contents = list( - /obj/item/gun/projectile/automatic/c20r = 1, - /obj/item/ammo_magazine/a10mm = 2, + /obj/item/storage/box/survival = 1, + /obj/item/gun/projectile/automatic/tommygun = 1, + /obj/item/ammo_magazine/submachinemag = 2, + /obj/item/ammo_magazine/c45m = 1, /obj/item/storage/firstaid/combat = 1, - /obj/item/storage/firstaid/adv = 2, + /obj/item/storage/firstaid/adv = 1, /obj/item/device/healthanalyzer = 1, - /obj/item/tank/oxygen = 1, - /obj/item/reagent_containers/glass/bottle/thetamycin = 1, /obj/item/reagent_containers/hypospray/autoinjector/coagzolug = 1 ) @@ -54,14 +60,16 @@ /obj/item/reagent_containers/glass/bottle/dexalin_plus = 1, /obj/item/reagent_containers/glass/bottle/butazoline = 1, /obj/item/reagent_containers/glass/bottle/dermaline = 1, - /obj/item/reagent_containers/glass/bottle/perconol = 1 + /obj/item/reagent_containers/glass/bottle/perconol = 1, + /obj/item/reagent_containers/glass/bottle/thetamycin = 1, + /obj/item/material/knife/trench = 1 ) /datum/outfit/admin/ert/mercenary/engineer name = "Mercenary Freelancer Combat Engineer" + belt = /obj/item/storage/belt/military back = /obj/item/storage/backpack/duffel - belt = /obj/item/storage/belt/utility/full gloves = /obj/item/clothing/gloves/yellow accessory = /obj/item/clothing/accessory/storage/brown_vest accessory_contents = list( @@ -69,20 +77,23 @@ ) backpack_contents = list( - /obj/item/material/knife/trench = 1, - /obj/item/shield/energy = 1, - /obj/item/handcuffs/ziptie = 1, - /obj/item/tank/oxygen = 1, - /obj/item/device/multitool = 1, - /obj/item/weldingtool/hugetank = 1, + /obj/item/storage/box/survival = 1, /obj/item/clothing/glasses/welding/superior = 1, /obj/item/gun/projectile/shotgun/pump/combat/sol = 1, /obj/item/storage/box/shotgunshells = 1, /obj/item/landmine/frag = 1, - /obj/item/landmine/emp = 1 + /obj/item/landmine/emp = 1, + /obj/item/storage/belt/utility/very_full = 1, + /obj/item/gun/projectile/colt = 1 ) - belt_contents = null + belt_contents = list( + /obj/item/material/knife/trench = 1, + /obj/item/ammo_magazine/c45m = 2, + /obj/item/handcuffs/ziptie = 1, + /obj/item/shield/energy = 1, + /obj/item/device/flashlight/flare = 1, + ) /datum/outfit/admin/ert/mercenary/leader name = "Mercenary Freelancer Leader" @@ -92,11 +103,17 @@ suit_store = null suit = null head = null + mask = /obj/item/clothing/mask/smokable/cigarette/cigar/cohiba + glasses = /obj/item/clothing/glasses/sunglasses/aviator + accessory = /obj/item/clothing/accessory/holster/thigh + accessory_contents = list(/obj/item/gun/projectile/revolver = 1) backpack_contents = list() belt_contents = list( - /obj/item/ammo_magazine/c762 = 3, - /obj/item/handcuffs/ziptie = 2, - /obj/item/shield/energy = 1 + /obj/item/ammo_magazine/c762 = 2, + /obj/item/handcuffs/ziptie = 1, + /obj/item/shield/energy = 1, + /obj/item/ammo_magazine/a357 = 2, + /obj/item/material/knife/trench = 1 ) \ No newline at end of file diff --git a/html/changelogs/wickedcybs_freelancerwep.yml b/html/changelogs/wickedcybs_freelancerwep.yml new file mode 100644 index 00000000000..f277e817d91 --- /dev/null +++ b/html/changelogs/wickedcybs_freelancerwep.yml @@ -0,0 +1,7 @@ +author: WickedCybs + +delete-after: True + +changes: + - tweak: "The Freelancers distress team has had its equipment changed up. Everyone now gets sidearms, the leader getting a revolver and the rest having .45s. The 10mm submachineguns have been swapped for a .45 submachinegun. People who lacked a knife have one now. At the baseline, they're stil one of the weaker ERT's comparatively but no longer major pushovers other than the lead, who has always been good." + - maptweak: "Freelancers now get some additional equipment if they're rolled. The Distress team base will give them zippos, cigars, holsters, vests and a few weapon racks that will provide random guns to vary up their firepower within reason. No two merc outfits are alike, right?" \ No newline at end of file diff --git a/maps/templates/distress/distress_equipment.dm b/maps/templates/distress/distress_equipment.dm index dcd86b80797..f53e72fb39c 100644 --- a/maps/templates/distress/distress_equipment.dm +++ b/maps/templates/distress/distress_equipment.dm @@ -4,4 +4,8 @@ /datum/map_template/distress_kataphract name = "kataphract distress equipment" - mappath = 'maps/templates/distress/kataphracts.dmm' \ No newline at end of file + mappath = 'maps/templates/distress/kataphracts.dmm' + +/datum/map_template/distress_freelancers + name = "freelancer distress equipment" + mappath = 'maps/templates/distress/freelancers.dmm' \ No newline at end of file diff --git a/maps/templates/distress/freelancers.dmm b/maps/templates/distress/freelancers.dmm new file mode 100644 index 00000000000..50606bc0b51 --- /dev/null +++ b/maps/templates/distress/freelancers.dmm @@ -0,0 +1,113 @@ +//MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE +"b" = ( +/turf/unsimulated/floor{ + dir = 5; + icon_state = "vault" + }, +/area/centcom/distress_prep) +"d" = ( +/obj/structure/table/rack, +/obj/random/weapon_and_ammo{ + chosen_rarity = Common + }, +/turf/unsimulated/floor{ + dir = 5; + icon_state = "vault" + }, +/area/centcom/distress_prep) +"r" = ( +/obj/structure/table/rack, +/obj/random/weapon_and_ammo{ + chosen_rarity = Rare + }, +/turf/unsimulated/floor{ + dir = 5; + icon_state = "vault" + }, +/area/centcom/distress_prep) +"E" = ( +/obj/structure/table/rack, +/obj/item/clothing/accessory/holster/thigh, +/obj/item/clothing/accessory/holster/thigh, +/obj/item/clothing/accessory/holster/thigh, +/obj/item/clothing/accessory/holster/thigh, +/obj/item/clothing/accessory/holster/thigh, +/obj/item/clothing/accessory/storage/black_vest, +/obj/item/clothing/accessory/storage/black_vest, +/obj/item/clothing/accessory/storage/black_vest, +/turf/unsimulated/floor{ + dir = 5; + icon_state = "vault" + }, +/area/centcom/distress_prep) +"Y" = ( +/obj/structure/table/wood, +/obj/item/coin/gold{ + pixel_x = -3; + pixel_y = 6 + }, +/obj/item/coin/gold{ + pixel_x = -3; + pixel_y = 6 + }, +/obj/item/storage/box/fancy/cigarettes/cigar{ + pixel_x = -6; + pixel_y = -1 + }, +/obj/item/storage/box/fancy/cigarettes/cigar{ + pixel_x = -1; + pixel_y = -1 + }, +/obj/item/flame/lighter/zippo/gold{ + pixel_x = 7; + pixel_y = 4 + }, +/obj/item/flame/lighter/zippo/gold{ + pixel_x = 7; + pixel_y = 4 + }, +/obj/item/flame/lighter/zippo/royal{ + pixel_x = 7 + }, +/obj/item/flame/lighter/zippo/black{ + pixel_x = 7; + pixel_y = -7 + }, +/obj/item/flame/lighter/zippo/black{ + pixel_x = 7; + pixel_y = -7 + }, +/obj/item/lipstick/random{ + pixel_x = -7; + pixel_y = 6 + }, +/obj/random/spacecash{ + pixel_x = -2; + pixel_y = -9 + }, +/turf/unsimulated/floor{ + dir = 5; + icon_state = "vault" + }, +/area/centcom/distress_prep) + +(1,1,1) = {" +b +E +d +"} +(2,1,1) = {" +b +b +r +"} +(3,1,1) = {" +b +b +r +"} +(4,1,1) = {" +b +b +Y +"}