diff --git a/code/datums/outfits/ert/fsf.dm b/code/datums/outfits/ert/fsf.dm index 69f8a99b563..2ee8cddb3b4 100644 --- a/code/datums/outfits/ert/fsf.dm +++ b/code/datums/outfits/ert/fsf.dm @@ -110,9 +110,11 @@ name = "Free Solarian Fleets Synthetic Unit" uniform = /obj/item/clothing/under/rank/fatigues + accessory = /obj/item/clothing/accessory/storage/webbingharness/pouches/ert + accessory_contents = list(/obj/item/gun/projectile/pistol/sol = 1, /obj/item/ammo_magazine/mc9mm = 2) shoes = /obj/item/clothing/shoes/jackboots belt = /obj/item/storage/belt/utility/very_full - head = null + head = /obj/item/clothing/head/helmet/pilot suit = null suit_store = null l_pocket = null @@ -123,6 +125,5 @@ backpack_contents = list( /obj/item/melee/energy/sword/knife/sol = 1, /obj/item/grenade/smokebomb = 2, - /obj/item/device/binoculars = 1, - /obj/item/ammo_magazine/mc9mm = 2 + /obj/item/device/binoculars = 1 ) diff --git a/code/datums/outfits/ert/tcfl.dm b/code/datums/outfits/ert/tcfl.dm index 72a21b6298c..0756815fb7d 100644 --- a/code/datums/outfits/ert/tcfl.dm +++ b/code/datums/outfits/ert/tcfl.dm @@ -44,8 +44,10 @@ gloves = null back = null belt = /obj/item/storage/belt/security/tactical - accessory = /obj/item/clothing/accessory/holster/hip - accessory_contents = list(/obj/item/gun/energy/blaster/revolver/pilot = 1) + accessory = /obj/item/clothing/accessory/storage/webbingharness/pouches/ert + accessory_contents = list(/obj/item/gun/energy/blaster/pilot_special = 1, /obj/item/device/binoculars = 1) + + backpack_contents = null /datum/outfit/admin/ert/legion/sentinel name = "TCFL Sentinel" diff --git a/code/modules/client/preference_setup/loadout/loadout_accessories.dm b/code/modules/client/preference_setup/loadout/loadout_accessories.dm index 3a5c179b352..2e2eb15564b 100644 --- a/code/modules/client/preference_setup/loadout/loadout_accessories.dm +++ b/code/modules/client/preference_setup/loadout/loadout_accessories.dm @@ -111,6 +111,32 @@ cost = 2 flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION +/datum/gear/accessory/webbing_harness + display_name = "webbing, harness selection" + path = /obj/item/clothing/accessory/storage/webbingharness + flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION + +/datum/gear/accessory/webbing_harness/New() + ..() + var/webbingharness = list() + webbingharness["webbing harness"] = /obj/item/clothing/accessory/storage/webbingharness + webbingharness["webbing harness, pouches"] = /obj/item/clothing/accessory/storage/webbingharness/pouches + webbingharness["webbing harness, pouches alt"] = /obj/item/clothing/accessory/storage/webbingharness/alt + gear_tweaks += new/datum/gear_tweak/path(webbingharness) + +/datum/gear/accessory/colorable_webbing_harness + display_name = "webbing, colorable harness selection" + path = /obj/item/clothing/accessory/storage/webbingharness/grayscale + flags = GEAR_HAS_NAME_SELECTION | GEAR_HAS_DESC_SELECTION | GEAR_HAS_COLOR_SELECTION + +/datum/gear/accessory/colorable_webbing_harness/New() + ..() + var/colorableharness = list() + colorableharness["webbing harness"] = /obj/item/clothing/accessory/storage/webbingharness/grayscale + colorableharness["webbing harness, pouches"] = /obj/item/clothing/accessory/storage/webbingharness/pouches/grayscale + colorableharness["webbing harness, pouches alt"] = /obj/item/clothing/accessory/storage/webbingharness/alt/grayscale + gear_tweaks += new/datum/gear_tweak/path(colorableharness) + /datum/gear/accessory/brown_pouches display_name = "drop pouches, engineering" path = /obj/item/clothing/accessory/storage/pouches/brown diff --git a/code/modules/clothing/under/accessories/storage.dm b/code/modules/clothing/under/accessories/storage.dm index d3ede838aba..67ef1aaff60 100644 --- a/code/modules/clothing/under/accessories/storage.dm +++ b/code/modules/clothing/under/accessories/storage.dm @@ -70,6 +70,30 @@ icon_state = "vest_white" slots = 5 +/obj/item/clothing/accessory/storage/webbingharness + name = "webbing harness" + desc = "Durable mess of synthcotton belts and buckles. Has some pouches, but not a lot." + icon_state = "vest_harness" + +/obj/item/clothing/accessory/storage/webbingharness/alt + icon_state = "vest_harness_alt" + +/obj/item/clothing/accessory/storage/webbingharness/pouches + icon_state = "vest_harness_pouches" + +/obj/item/clothing/accessory/storage/webbingharness/pouches/ert + desc = "Durable mess of synthcotton belts and buckles. To better satiate the need for storage and stability." + slots = 5 + +/obj/item/clothing/accessory/storage/webbingharness/grayscale + icon_state = "vest_harness_g" + +/obj/item/clothing/accessory/storage/webbingharness/alt/grayscale + icon_state = "vest_harness_alt_g" + +/obj/item/clothing/accessory/storage/webbingharness/pouches/grayscale + icon_state = "vest_harness_pouches_g" + /obj/item/clothing/accessory/storage/overalls name = "overalls" desc = "Heavy-duty overalls for use on the work site, with plenty of convenient pockets to boot." diff --git a/code/modules/projectiles/guns/energy/blaster.dm b/code/modules/projectiles/guns/energy/blaster.dm index a0ed37938c5..f9c07f04557 100644 --- a/code/modules/projectiles/guns/energy/blaster.dm +++ b/code/modules/projectiles/guns/energy/blaster.dm @@ -38,9 +38,16 @@ dispersion = list(3,6,9,12) firemodes = list() +/obj/item/gun/energy/blaster/pilot_special + name = "pilot's sidearm" + desc = "A robust, low in maintenance blaster pistol. Customized for peak performance and perfect for self-defense purposes." + max_shots = 8 + accuracy = 2 // Likely to get nothing else, so they gotta know how to make it count. + offhand_accuracy = 2 + /obj/item/gun/energy/blaster/revolver name = "blaster revolver" - desc = "A robust eight-shot blaster.." + desc = "A robust eight-shot blaster." icon = 'icons/obj/guns/blaster_revolver.dmi' icon_state = "blaster_revolver" item_state = "blaster_revolver" @@ -62,10 +69,6 @@ user.visible_message(SPAN_WARNING("\The [user] spins the cylinder of \the [src]!"), SPAN_WARNING("You spin the cylinder of \the [src]!"), SPAN_NOTICE("You hear something metallic spin and click.")) playsound(src.loc, 'sound/weapons/revolver_spin.ogg', 100, 1) -/obj/item/gun/energy/blaster/revolver/pilot - name = "pilot's sidearm" - desc = "A robust, low in maintenance, eight-shot blaster. Perfect for self-defense purposes." - /obj/item/gun/energy/blaster/carbine name = "blaster carbine" desc = "A short-barreled blaster carbine meant for easy handling and comfort when in combat." diff --git a/html/changelogs/wickedcybs_harness.yml b/html/changelogs/wickedcybs_harness.yml new file mode 100644 index 00000000000..b7997eb8d04 --- /dev/null +++ b/html/changelogs/wickedcybs_harness.yml @@ -0,0 +1,9 @@ +author: WickedCybs + +delete-after: True + +changes: + - rscadd: "Added a new webbing accessory, a webbing harness which was taken from Polaris and tweaked. There are three variants to pick from in the loadout. Recolourable versions too." + - tweak: "The FSF synthetic unit now gets a pilot helmet and exchanges its holster for a webbing harness." + - tweak: "The TCFL pilot has had their sidearm slightly reflavoured, it's now an enhanced blaster pistol. Their holster has also been swapped for a webbing harness for a piloty aesthetic." + - maptweak: "Mapped in the new harnesses to a few offstation antag roles, like merc. Burglars can also select from more than just holsters now, in case they want to use a webbing." \ No newline at end of file diff --git a/icons/mob/ties.dmi b/icons/mob/ties.dmi index 6248da32ef6..3a894ebe148 100644 Binary files a/icons/mob/ties.dmi and b/icons/mob/ties.dmi differ diff --git a/icons/obj/clothing/ties.dmi b/icons/obj/clothing/ties.dmi index 82e36a8ffb7..e6d6775ece2 100644 Binary files a/icons/obj/clothing/ties.dmi and b/icons/obj/clothing/ties.dmi differ diff --git a/maps/aurora/aurora-1_centcomm.dmm b/maps/aurora/aurora-1_centcomm.dmm index c28bebc740a..9e27949fd5b 100644 --- a/maps/aurora/aurora-1_centcomm.dmm +++ b/maps/aurora/aurora-1_centcomm.dmm @@ -16952,8 +16952,15 @@ /turf/simulated/floor/wood, /area/centcom/shared_dream) "gOV" = ( -/obj/structure/table/reinforced, +/obj/item/clothing/accessory/storage/webbingharness/pouches/ert, +/obj/item/clothing/accessory/storage/webbingharness/alt{ + slots = 5 + }, +/obj/item/clothing/accessory/storage/webbingharness{ + slots = 5 + }, /obj/item/device/binoculars, +/obj/structure/table/reinforced, /turf/simulated/floor/shuttle/black, /area/shuttle/mercenary) "gPb" = ( @@ -17001,6 +17008,16 @@ /obj/item/clothing/accessory/holster/armpit/brown, /obj/item/clothing/gloves/black_leather, /obj/item/clothing/gloves/black_leather, +/obj/item/clothing/accessory/storage/webbingharness/alt{ + slots = 5 + }, +/obj/item/clothing/accessory/storage/webbingharness/pouches/ert, +/obj/item/clothing/accessory/storage/webbingharness{ + slots = 5 + }, +/obj/item/clothing/accessory/storage/black_vest, +/obj/item/clothing/accessory/storage/brown_vest, +/obj/item/clothing/accessory/storage/white_vest, /turf/unsimulated/floor, /area/antag/burglar) "gPO" = ( diff --git a/maps/templates/distress/freelancers.dmm b/maps/templates/distress/freelancers.dmm index 50606bc0b51..403582db41b 100644 --- a/maps/templates/distress/freelancers.dmm +++ b/maps/templates/distress/freelancers.dmm @@ -32,6 +32,14 @@ /obj/item/clothing/accessory/holster/thigh, /obj/item/clothing/accessory/holster/thigh, /obj/item/clothing/accessory/holster/thigh, +/obj/item/clothing/accessory/storage/webbingharness{ + slots = 5 + }, +/obj/item/clothing/accessory/storage/webbingharness{ + slots = 5 + }, +/obj/item/clothing/accessory/storage/webbingharness/pouches/ert, +/obj/item/clothing/accessory/storage/black_vest, /obj/item/clothing/accessory/storage/black_vest, /obj/item/clothing/accessory/storage/black_vest, /obj/item/clothing/accessory/storage/black_vest,