diff --git a/maps/sierra/icons/obj/ammo.dmi b/maps/sierra/icons/obj/ammo.dmi new file mode 100644 index 0000000000000..2967e5fef9b89 Binary files /dev/null and b/maps/sierra/icons/obj/ammo.dmi differ diff --git a/maps/sierra/icons/obj/medical.dmi b/maps/sierra/icons/obj/medical.dmi new file mode 100644 index 0000000000000..9433a26993dcd Binary files /dev/null and b/maps/sierra/icons/obj/medical.dmi differ diff --git a/maps/sierra/items/ammo.dm b/maps/sierra/items/ammo.dm new file mode 100644 index 0000000000000..a4eba6ad8dd73 --- /dev/null +++ b/maps/sierra/items/ammo.dm @@ -0,0 +1,31 @@ +/************************* +sierra specific ammo types +**************************/ + +/* +Manstopper Rounds - Shotgun +*/ + +/obj/item/storage/box/ammo/manstoppershells + name = "box of manstopper shells" + startswith = list(/obj/item/ammo_magazine/shotholder/manstopper = 2) + +/obj/item/ammo_magazine/shotholder/manstopper + name = "manstopper shell holder" + ammo_type = /obj/item/ammo_casing/shotgun/manstopper + marking_color = COLOR_SURGERY_BLUE + +/obj/item/ammo_casing/shotgun/manstopper + name = "shotgun shell" + desc = "A manstopper shell." + icon = 'maps/sierra/icons/obj/ammo.dmi' + icon_state = "mnshell" + spent_icon = "mnshell-spent" + projectile_type = /obj/item/projectile/bullet/shotgun/manstopper + matter = list(MATERIAL_STEEL = 360) + +/obj/item/projectile/bullet/shotgun/manstopper + name = "manstopper" + damage = 50 + agony = 30 + armor_penetration = 0 diff --git a/maps/sierra/items/items.dm b/maps/sierra/items/items.dm index 598b6950aee20..94e8643f1367f 100644 --- a/maps/sierra/items/items.dm +++ b/maps/sierra/items/items.dm @@ -18,6 +18,49 @@ sierra specific items desc = "A rugged backpack worn over one shoulder." icon_state = "courierbagsci" +/obj/item/storage/firstaid/security + name = "Tactical first-aid kit" + desc = "It's a small emergency medical kit. Dark and lightweight." + use_sound = 'sound/effects/storage/pillbottle.ogg' + icon = 'maps/sierra/icons/obj/medical.dmi' + icon_state = "fak-sec" + matter = list(MATERIAL_PLASTIC = 600) + storage_slots = 7 + w_class = ITEM_SIZE_SMALL + max_w_class = ITEM_SIZE_SMALL + startswith = list( + /obj/item/reagent_containers/hypospray/autoinjector/inaprovaline, + /obj/item/reagent_containers/hypospray/autoinjector/antirad, + /obj/item/reagent_containers/hypospray/autoinjector/detox, + /obj/item/reagent_containers/hypospray/autoinjector/dexalin, + /obj/item/reagent_containers/hypospray/autoinjector/kelotane, + /obj/item/reagent_containers/hypospray/autoinjector/pain, + /obj/item/stack/medical/bruise_pack + ) + can_hold = list( + /obj/item/reagent_containers/hypospray/autoinjector, + /obj/item/stack/medical/bruise_pack + ) + +/obj/item/reagent_containers/hypospray/autoinjector/dexalin + name ="autoinjector (dexalin plus)" + starts_with = list(/datum/reagent/dexalin = 5) + +/obj/item/reagent_containers/hypospray/autoinjector/kelotane + name = "autoinjector (antiburn)" + starts_with = list(/datum/reagent/kelotane = 5) + +/obj/item/reagent_containers/hypospray/autoinjector/kelotane + name = "autoinjector (antiburn)" + starts_with = list(/datum/reagent/kelotane = 5) + +// Containers + +/obj/item/storage/backpack/dufflebag/syndie_kit/plastique + startswith = list( + /obj/item/plastique = 6 + ) + /*********** Unique items ***********/ diff --git a/maps/sierra/sierra.dm b/maps/sierra/sierra.dm index 77c1af1fc8696..7ba40ea3aa3ba 100644 --- a/maps/sierra/sierra.dm +++ b/maps/sierra/sierra.dm @@ -48,6 +48,7 @@ #include "game/lockdown.dm" // --- ITEMS --- // + #include "items/ammo.dm" #include "items/cards_ids.dm" #include "items/documents.dm" #include "items/encryption_keys.dm" diff --git a/maps/sierra/structures/closets/armory.dm b/maps/sierra/structures/closets/armory.dm index ae5558248ee6d..9ae84fd6ffed9 100644 --- a/maps/sierra/structures/closets/armory.dm +++ b/maps/sierra/structures/closets/armory.dm @@ -14,20 +14,24 @@ /obj/structure/closet/secure_closet/guncabinet/sierra_armory/shotgun/WillContain() return list(/obj/item/gun/projectile/shotgun/pump/combat = 2, - /obj/item/clothing/accessory/storage/bandolier = 2) + /obj/item/clothing/accessory/storage/bandolier = 2, + /obj/item/storage/box/ammo/beanbags = 2, + /obj/item/storage/box/ammo/practiceshells = 2, + /obj/item/storage/box/ammo/manstoppershells = 2) /obj/structure/closet/secure_closet/guncabinet/sierra_armory/laser name = "laser guncabinet" /obj/structure/closet/secure_closet/guncabinet/sierra_armory/laser/WillContain() - return list(/obj/item/gun/energy/laser/secure = 4) + return list(/obj/item/gun/energy/laser/secure = 6) /obj/structure/closet/secure_closet/guncabinet/sierra_armory/stun name = "stun guncabinet" /obj/structure/closet/secure_closet/guncabinet/sierra_armory/stun/WillContain() return list(/obj/item/gun/energy/stunrevolver/rifle = 2, - /obj/item/gun/energy/taser/carbine = 2) + /obj/item/gun/energy/taser/carbine = 2, + /obj/item/gun/energy/taser = 4) /obj/structure/closet/secure_closet/guncabinet/sierra_armory/ion name = "ion guncabinet" @@ -40,7 +44,7 @@ name = "energy guncabinet" /obj/structure/closet/secure_closet/guncabinet/sierra_armory/egun/WillContain() - return list(/obj/item/gun/energy/gun/secure = 4) + return list(/obj/item/gun/energy/gun/secure = 3) /obj/structure/closet/secure_closet/guncabinet/sierra_armory/launcher name = "grenade launcher guncabinet" diff --git a/maps/sierra/structures/closets/misc.dm b/maps/sierra/structures/closets/misc.dm index 94699e32c2cd1..5cfc5156e8402 100644 --- a/maps/sierra/structures/closets/misc.dm +++ b/maps/sierra/structures/closets/misc.dm @@ -60,3 +60,64 @@ /obj/structure/closet/crate/present name = "present crate" desc = "Wow, a present!" + +///Ninja equipment loadouts. Placed here because author overrided them using Torch files. Now we overriding this again for some QoL stuff. +/obj/structure/closet/crate/ninja/sol + name = "sol equipment crate" + desc = "A tactical equipment crate." + +/obj/structure/closet/crate/ninja/sol/WillContain() + return list( + /obj/item/rig/light/ninja/sol, + /obj/item/gun/projectile/pistol/m22f, + /obj/item/ammo_magazine/pistol/double = 2, + /obj/item/clothing/under/scga/utility/urban, + /obj/item/clothing/shoes/swat, + /obj/item/clothing/accessory/scga_rank/e6 + ) + +/obj/structure/closet/crate/ninja/gcc + name = "gcc equipment crate" + desc = "A heavy equipment crate." + +/obj/structure/closet/crate/ninja/gcc/WillContain() + return list( + /obj/item/rig/light/ninja/gcc, + /obj/item/gun/projectile/pistol/optimus, + /obj/item/ammo_magazine/pistol/double = 2, + /obj/item/ammo_magazine/box/minigun = 2, + /obj/item/clothing/under/iccgn/utility, + /obj/item/clothing/shoes/iccgn/utility, + /obj/item/clothing/accessory/iccgn_rank/or6 + ) + +/obj/structure/closet/crate/ninja/corpo + name = "corporate equipment crate" + desc = "A patented equipment crate." + +/obj/structure/closet/crate/ninja/corpo/WillContain() + return list( + /obj/item/rig/light/ninja/corpo, + /obj/item/gun/energy/gun, + /obj/item/inducer, + /obj/item/clothing/under/rank/security/corp, + /obj/item/clothing/shoes/swat, + /obj/item/clothing/accessory/badge/holo + ) + +/obj/structure/closet/crate/ninja/merc + name = "mercenary equipment crate" + desc = "A traitorous equipment crate." + +/obj/structure/closet/crate/ninja/merc/WillContain() + return list( + /obj/item/rig/merc/ninja, + /obj/item/gun/projectile/revolver/medium, + /obj/item/ammo_magazine/speedloader = 2, + /obj/item/clothing/under/syndicate/combat, + /obj/item/clothing/shoes/swat, + /obj/item/clothing/mask/gas/syndicate, + /obj/item/storage/backpack/dufflebag/syndie_kit/plastique, + /obj/item/storage/box/anti_photons, + /obj/item/card/emag + ) diff --git a/maps/sierra/structures/closets/security.dm b/maps/sierra/structures/closets/security.dm index 2eaf19c7c2a58..21d2a16586e97 100644 --- a/maps/sierra/structures/closets/security.dm +++ b/maps/sierra/structures/closets/security.dm @@ -22,7 +22,9 @@ /obj/item/device/flash, /obj/item/device/megaphone, /obj/item/melee/baton/loaded, - /obj/item/gun/energy/gun/secure, + /obj/item/gun/projectile/pistol/sec, + /obj/item/ammo_magazine/pistol/rubber, + /obj/item/ammo_magazine/pistol, /obj/item/melee/telebaton, /obj/item/device/taperecorder, /obj/item/reagent_containers/spray/pepper, @@ -35,7 +37,7 @@ /obj/item/crowbar/prybar, /obj/item/device/radio/off, /obj/item/clothing/mask/gas/half, - /obj/item/storage/firstaid/combat + /obj/item/storage/firstaid/security ) /obj/structure/closet/secure_closet/warden/sierra @@ -59,7 +61,9 @@ /obj/item/storage/belt/holster/security, /obj/item/reagent_containers/spray/pepper, /obj/item/melee/baton/loaded, - /obj/item/gun/energy/gun/secure, + /obj/item/gun/projectile/pistol/sec, + /obj/item/ammo_magazine/pistol/rubber, + /obj/item/ammo_magazine/pistol, /obj/item/clothing/accessory/storage/black_vest, /obj/item/gun/energy/taser, /obj/item/handcuffs, @@ -73,7 +77,7 @@ /obj/item/crowbar/prybar, /obj/item/device/radio/off, /obj/item/clothing/mask/gas/half, - /obj/item/storage/firstaid/regular + /obj/item/storage/firstaid/security ) /obj/structure/closet/secure_closet/cabinet/forensics @@ -92,7 +96,8 @@ /obj/item/device/radio/headset/headset_sec, /obj/item/device/radio/headset/headset_sec/alt, /obj/item/clothing/suit/armor/pcarrier/medium/nt, - /obj/item/gun/energy/gun/small/secure, + /obj/item/gun/projectile/pistol/sec, + /obj/item/ammo_magazine/pistol/rubber, /obj/item/device/flash, /obj/item/melee/baton/loaded, /obj/item/reagent_containers/spray/pepper, @@ -107,7 +112,7 @@ /obj/item/crowbar/prybar, /obj/item/device/radio/off, /obj/item/clothing/mask/gas/half, - /obj/item/storage/firstaid/regular + /obj/item/storage/firstaid/security ) /obj/structure/closet/secure_closet/security/sierra @@ -130,7 +135,9 @@ /obj/item/taperoll/police, /obj/item/device/hailer, /obj/item/clothing/accessory/storage/black_vest, - /obj/item/gun/energy/gun/secure, + /obj/item/gun/projectile/pistol/sec, + /obj/item/ammo_magazine/pistol/rubber, + /obj/item/ammo_magazine/pistol, /obj/item/device/megaphone, /obj/item/clothing/gloves/thick, /obj/item/device/holowarrant, @@ -138,7 +145,7 @@ /obj/item/crowbar/prybar, /obj/item/device/radio/off, /obj/item/clothing/mask/gas/half, - /obj/item/storage/firstaid/regular + /obj/item/storage/firstaid/security ) /obj/structure/closet/secure_closet/security/sierra/cadet