diff --git a/modular_ss220/clothing/code/suits.dm b/modular_ss220/clothing/code/suits.dm index 44f1a3a63e2a..c184c4af2d7c 100644 --- a/modular_ss220/clothing/code/suits.dm +++ b/modular_ss220/clothing/code/suits.dm @@ -80,3 +80,11 @@ name = "светло-голубой акулий капюшон" icon_state = "shark_casual_light" item_state = "shark_casual_light" + +/obj/item/clothing/suit/space/deathsquad/officer/syndie + name = "куртка офицера синдиката" + desc = "Длинная куртка из высокопрочного волокна." + icon = 'modular_ss220/clothing/icons/object/suits.dmi' + icon_state = "jacket_syndie" + icon_override = 'modular_ss220/clothing/icons/mob/suits.dmi' + item_state = "jacket_syndie" diff --git a/modular_ss220/clothing/icons/mob/suits.dmi b/modular_ss220/clothing/icons/mob/suits.dmi index 6e6bbff67d39..ef67e36af000 100644 Binary files a/modular_ss220/clothing/icons/mob/suits.dmi and b/modular_ss220/clothing/icons/mob/suits.dmi differ diff --git a/modular_ss220/clothing/icons/object/suits.dmi b/modular_ss220/clothing/icons/object/suits.dmi index 398edcbb19f3..1505ac9676d6 100644 Binary files a/modular_ss220/clothing/icons/object/suits.dmi and b/modular_ss220/clothing/icons/object/suits.dmi differ diff --git a/modular_ss220/modular_ss220.dme b/modular_ss220/modular_ss220.dme index 564f8c5c841b..3e3f4c5a8fae 100644 --- a/modular_ss220/modular_ss220.dme +++ b/modular_ss220/modular_ss220.dme @@ -40,6 +40,7 @@ #include "cinematics/_cinematics.dme" #include "closet_picklocking/_closet_picklocking.dme" #include "crawl_speed/_crawl_speed.dme" +#include "credits/_credits.dme" #include "cyrillic_fixes/_cyrillic_fixes.dme" #include "debug/_debug.dme" #include "detective_rework/detective_rework.dme" @@ -62,7 +63,7 @@ #include "text_to_speech/_tts.dme" #include "title_screen/_title_screen.dme" #include "whitelist/_whitelist.dme" -#include "credits/_credits.dme" +#include "outfits/_outfits.dme" // --- PRIME --- // // #define MODPACK_MAIN_ONLY diff --git a/modular_ss220/objects/code/weapons.dm b/modular_ss220/objects/code/weapons.dm index a3b0ef965f21..ceb6020c06b9 100644 --- a/modular_ss220/objects/code/weapons.dm +++ b/modular_ss220/objects/code/weapons.dm @@ -57,6 +57,7 @@ w_class = WEIGHT_CLASS_NORMAL ammo_type = /obj/item/ammo_casing/d44 max_ammo = 24 + icon = 'modular_ss220/objects/icons/ammo.dmi' icon_state = "44_box" /obj/structure/displaycase/hos diff --git a/modular_ss220/outfits/_outfits.dm b/modular_ss220/outfits/_outfits.dm new file mode 100644 index 000000000000..a761085d5890 --- /dev/null +++ b/modular_ss220/outfits/_outfits.dm @@ -0,0 +1,4 @@ +/datum/modpack/outfits + name = "Outfits" + desc = "Аутфиты для админ спавна." + author = "Grombila" diff --git a/modular_ss220/outfits/_outfits.dme b/modular_ss220/outfits/_outfits.dme new file mode 100644 index 000000000000..d10bfeea5088 --- /dev/null +++ b/modular_ss220/outfits/_outfits.dme @@ -0,0 +1,3 @@ +#include "_outfits.dm" + +#include "code/outfits.dm" diff --git a/modular_ss220/outfits/code/outfits.dm b/modular_ss220/outfits/code/outfits.dm new file mode 100644 index 000000000000..b70cf4ed4d0f --- /dev/null +++ b/modular_ss220/outfits/code/outfits.dm @@ -0,0 +1,92 @@ +/datum/outfit/admin/srt + name = "Special Response Team Member" + + uniform = /obj/item/clothing/under/solgov/srt + suit = /obj/item/clothing/suit/armor/vest/fluff/tactical + suit_store = /obj/item/gun/energy/gun/blueshield/pdw9 + back = /obj/item/storage/backpack/satchel_blueshield + belt = /obj/item/storage/belt/military/assault/srt + gloves = /obj/item/clothing/gloves/combat + shoes = /obj/item/clothing/shoes/combat/swat + head = /obj/item/clothing/head/beret/centcom/officer/navy/marine + l_ear = /obj/item/radio/headset/ert/alt + glasses = /obj/item/clothing/glasses/hud/security/sunglasses + id = /obj/item/card/id/ert/security + pda = /obj/item/pda/heads/ert/security + box = /obj/item/storage/box/responseteam + r_pocket = /obj/item/flashlight/seclite + l_pocket = /obj/item/pinpointer/advpinpointer + backpack_contents = list( + /obj/item/clothing/mask/gas/explorer/marines, + /obj/item/storage/box/handcuffs, + /obj/item/ammo_box/magazine/smgm9mm, + /obj/item/clothing/accessory/holster, + /obj/item/gun/projectile/automatic/proto + ) + implants = list( + /obj/item/implant/mindshield + ) + cybernetic_implants = list( + /obj/item/organ/internal/cyberimp/arm/baton, + /obj/item/organ/internal/cyberimp/eyes/hud/security + ) + var/id_icon = "syndie" + +/datum/outfit/admin/srt/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) + . = ..() + if(visualsOnly) + return + + var/obj/item/card/id/I = H.wear_id + if(istype(I)) + apply_to_card(I, H, get_centcom_access("Emergency Response Team Member"), "Special Response Team Member") + I.assignment = "Emergency Response Team Officer" + H.sec_hud_set_ID() + +/datum/outfit/job/syndicateofficer + suit = /obj/item/clothing/suit/space/deathsquad/officer/syndie + +/datum/outfit/admin/soviet/marine/captain + + backpack_contents = list( + /obj/item/storage/box/soviet = 1, + /obj/item/gun/projectile/revolver/anaconda = 1, + /obj/item/ammo_box/speed_loader_d44 = 2, + /obj/item/storage/fancy/cigarettes/cigpack_syndicate = 1, + /obj/item/lighter/zippo/engraved = 1 + ) + +/datum/outfit/admin/soviet/officer + belt = /obj/item/gun/projectile/revolver/rsh12 + + backpack_contents = list( + /obj/item/storage/box/soviet = 1, + /obj/item/lighter/zippo = 1, + /obj/item/storage/fancy/cigarettes/cigpack_syndicate = 1, + /obj/item/ammo_box/speed_loader_mm127 = 2 + ) + +/datum/outfit/admin/soviet/admiral + belt = /obj/item/gun/projectile/revolver/rsh12 + + backpack_contents = list( + /obj/item/storage/box/soviet = 1, + /obj/item/ammo_box/speed_loader_mm127 = 3 + ) + + +/obj/item/clothing/under/solgov/srt + name = "marine uniform" + desc = "A comfortable and durable combat uniform" + +/obj/item/clothing/head/beret/centcom/officer/navy/marine + name = "navy blue beret" + +/obj/item/storage/belt/military/assault/srt/populate_contents() + new /obj/item/reagent_containers/spray/pepper(src) + new /obj/item/flash(src) + new /obj/item/grenade/flashbang(src) + new /obj/item/restraints/legcuffs/bola/energy(src) + new /obj/item/ammo_box/magazine/smgm9mm(src) + new /obj/item/ammo_box/magazine/smgm9mm(src) + update_icon() diff --git a/modular_ss220/vending/code/vending.dm b/modular_ss220/vending/code/vending.dm index 85e963574c19..f9512e0bcda4 100644 --- a/modular_ss220/vending/code/vending.dm +++ b/modular_ss220/vending/code/vending.dm @@ -21,8 +21,9 @@ /obj/item/ammo_box/magazine/laser = 12, /obj/item/ammo_box/magazine/wt550m9 = 8, /obj/item/storage/box/rubbershot = 4, - /obj/item/ammo_box/magazine/m556 = 12, - /obj/item/ammo_box/a40mm = 4) + /obj/item/ammo_box/magazine/m556/arg = 12, + /obj/item/ammo_box/a40mm = 4, + /obj/item/ammo_box/magazine/smgm9mm = 12) /obj/machinery/economy/vending/nta/blue name = "NT ERT Medium Gear & Ammunition" @@ -46,8 +47,8 @@ desc = "A ERT Heavy equipment vendor." ads_list = list("Круши черепа синдиката!","Не забывай, спасать - полезно!","Бжж-Бзз-з!.","Обезопасить, Удержать, Сохранить!","Стоять, снярядись на задание!") products = list( - /obj/item/gun/projectile/automatic/ar = 3, - /obj/item/ammo_box/magazine/m556 = 6, + /obj/item/gun/projectile/automatic/proto = 3, + /obj/item/ammo_box/magazine/smgm9mm/ap = 6, /obj/item/gun/energy/lasercannon = 3, /obj/item/gun/energy/immolator = 3, /obj/item/gun/energy/gun/nuclear = 3, @@ -68,8 +69,9 @@ /obj/item/restraints/handcuffs/cable/zipties = 5, /obj/item/grenade/flashbang = 3, /obj/item/flash = 2, - /obj/item/gun/energy/gun/advtaser = 4, + /obj/item/gun/energy/disabler = 4, /obj/item/gun/projectile/automatic/pistol/enforcer = 6, + /obj/item/ammo_box/magazine/enforcer = 12, /obj/item/gun/projectile/shotgun/riot = 1, /obj/item/storage/box/rubbershot = 3) @@ -86,6 +88,7 @@ /obj/item/gun/energy/xray = 8, /obj/item/gun/energy/pulse/destroyer/annihilator = 8, /obj/item/gun/energy/immolator/multi = 8, + /obj/item/gun/energy/bsg/prebuilt/admin = 4, /obj/item/grenade/clusterbuster/inferno = 3, /obj/item/grenade/clusterbuster/emp = 3)