diff --git a/aurorastation.dme b/aurorastation.dme index bc49b5b2d40..1f9d7c32321 100644 --- a/aurorastation.dme +++ b/aurorastation.dme @@ -547,6 +547,7 @@ #include "code\datums\outfits\event\outfit_megacorps.dm" #include "code\datums\outfits\event\outfit_nanotrasen.dm" #include "code\datums\outfits\event\outfit_scc.dm" +#include "code\datums\outfits\event\outfit_siib.dm" #include "code\datums\outfits\event\outfit_tfcl.dm" #include "code\datums\outfits\event\outfit_generic\_generic.dm" #include "code\datums\outfits\event\outfit_generic\business.dm" diff --git a/code/datums/outfits/event/outfit_siib.dm b/code/datums/outfits/event/outfit_siib.dm new file mode 100644 index 00000000000..3b69a0fd9f5 --- /dev/null +++ b/code/datums/outfits/event/outfit_siib.dm @@ -0,0 +1,52 @@ +/obj/outfit/admin/siib + name = "SIIB Agent" + + uniform = /obj/item/clothing/under/suit_jacket/charcoal + shoes = /obj/item/clothing/shoes/laceup + gloves = /obj/item/clothing/gloves/black + glasses = /obj/item/clothing/glasses/sunglasses/sechud + l_ear = /obj/item/device/radio/headset/ert/siib + back = /obj/item/storage/backpack/satchel/leather + r_pocket = /obj/item/ammo_magazine/mc9mm + + accessory = /obj/item/clothing/accessory/holster/hip + accessory_contents = list(/obj/item/gun/projectile/pistol/sol/siib = 1) + + backpack_contents = list( + /obj/item/storage/box/survival/engineer = 1, + /obj/item/device/flash = 1, + /obj/item/handcuffs/ziptie = 2 + ) + id = null + +/obj/outfit/admin/siib/operative + name = "SIIB Operative" + + uniform = /obj/item/clothing/under/suit_jacket/charcoal + shoes = /obj/item/clothing/shoes/jackboots + gloves = /obj/item/clothing/gloves/black + glasses = /obj/item/clothing/glasses/sunglasses/sechud/tactical + suit = /obj/item/clothing/suit/armor/carrier/heavy + suit_store = /obj/item/gun/projectile/automatic/c20r/sol/siib + mask = /obj/item/clothing/mask/balaclava + belt = /obj/item/storage/belt/military + l_ear = /obj/item/device/radio/headset/ert/siib + head = /obj/item/clothing/head/helmet/merc + back = /obj/item/storage/backpack/satchel/leather + r_pocket = /obj/item/ammo_magazine/mc9mm + + accessory = /obj/item/clothing/accessory/holster/hip + accessory_contents = list(/obj/item/gun/projectile/pistol/sol/siib = 1) + + belt_contents = list( + /obj/item/grenade/flashbang = 2, + /obj/item/ammo_magazine/mc9mm = 2, + /obj/item/ammo_magazine/a10mm = 3 + ) + + backpack_contents = list( + /obj/item/storage/box/survival/engineer = 1, + /obj/item/device/flash = 1, + /obj/item/crowbar/red = 1, + /obj/item/handcuffs/ziptie = 2 + ) diff --git a/code/game/objects/items/devices/radio/headset.dm b/code/game/objects/items/devices/radio/headset.dm index 58d92b5de9f..559b00a91ae 100644 --- a/code/game/objects/items/devices/radio/headset.dm +++ b/code/game/objects/items/devices/radio/headset.dm @@ -989,6 +989,12 @@ icon_state = "com_headset_alt" item_state = "headset_alt" +/obj/item/device/radio/headset/ert/siib + name = "radio headset" + desc = "An updated, modular intercom that fits over the head. Takes encryption keys. This one looks slightly modified..." + icon_state = "headset" + item_state = "headset" + /obj/item/device/radio/headset/legion name = "Tau Ceti Foreign Legion radio headset" desc = "The headset used by NanoTrasen sanctioned response forces." diff --git a/code/modules/projectiles/guns/projectile/automatic.dm b/code/modules/projectiles/guns/projectile/automatic.dm index a4fbff45e18..4402f4890c7 100644 --- a/code/modules/projectiles/guns/projectile/automatic.dm +++ b/code/modules/projectiles/guns/projectile/automatic.dm @@ -95,6 +95,17 @@ ..() icon_state = (ammo_magazine)? "vityaz" : "vityaz-empty" +/obj/item/gun/projectile/automatic/c20r/sol/siib + name = "solarian SIIB submachine gun" + desc = "Based off the standard solarian M470-L, this SMG is used by SIIB Operatives during raids and specialist operations. Officially, this variant of the SMG does not exist." + icon = 'icons/obj/guns/sol_smg.dmi' + icon_state = "vityaz-siib" + item_state = "vityaz-siib" + +/obj/item/gun/projectile/automatic/c20r/sol/siib/update_icon() + ..() + icon_state = (ammo_magazine)? "vityaz-siib" : "vityaz-siib-empty" + /obj/item/gun/projectile/automatic/xanusmg name = "\improper Xanan submachine gun" desc = "A sleek metal-framed submachine gun, produced by d.N.A Defense for the All-Xanu Armed Forces." diff --git a/code/modules/projectiles/guns/projectile/pistol.dm b/code/modules/projectiles/guns/projectile/pistol.dm index 39eba1d4102..f01546d4dc5 100644 --- a/code/modules/projectiles/guns/projectile/pistol.dm +++ b/code/modules/projectiles/guns/projectile/pistol.dm @@ -420,6 +420,22 @@ else icon_state = "m8-empty" +/obj/item/gun/projectile/pistol/sol/siib + name = "solarian SIIB silenced pistol" + desc = "A variant of the M8 solarian service pistol, this paticular variant comes with an integrated recoil compensator and are used by SIIB agents and operatives. Officially, this pistol does not exist." + icon = 'icons/obj/guns/sol_pistol.dmi' + icon_state = "m8-siib" + item_state = "m8-siib" + suppressed = FALSE + can_suppress = FALSE + +/obj/item/gun/projectile/pistol/sol/siib/update_icon() + ..() + if(ammo_magazine) + icon_state = "m8-siib" + else + icon_state = "m8-siib-empty" + /obj/item/gun/projectile/pistol/sol/konyang name = "konyang service pistol" desc = "The compact M8, redesignated as the K8, is the standard service pistol of the Konyanger Armed Forces. Inherited from the Solarian military, Zavodskoi has since given these handguns \ diff --git a/html/changelogs/cactusmouth-SIIB_Equipment.yml b/html/changelogs/cactusmouth-SIIB_Equipment.yml new file mode 100644 index 00000000000..540c4a265fe --- /dev/null +++ b/html/changelogs/cactusmouth-SIIB_Equipment.yml @@ -0,0 +1,9 @@ +author: CactusMouth + +delete-after: True + + +changes: + - rscadd: "Added the SIIB weapons alongside SIIB Outfits for Admins to use." + - imageadd: "Adds SIIB Weapons based off standard Sol weapons. (SMG and Pistol)" + diff --git a/icons/obj/guns/sol_pistol.dmi b/icons/obj/guns/sol_pistol.dmi index b5cc22698d2..239ee855d48 100644 Binary files a/icons/obj/guns/sol_pistol.dmi and b/icons/obj/guns/sol_pistol.dmi differ diff --git a/icons/obj/guns/sol_smg.dmi b/icons/obj/guns/sol_smg.dmi index 98f301d3939..4b6e951b376 100644 Binary files a/icons/obj/guns/sol_smg.dmi and b/icons/obj/guns/sol_smg.dmi differ