diff --git a/code/datums/uplink/gear loadout.dm b/code/datums/uplink/gear loadout.dm index 17b6e976c6d..ace703ad837 100644 --- a/code/datums/uplink/gear loadout.dm +++ b/code/datums/uplink/gear loadout.dm @@ -247,3 +247,15 @@ desc = "A crate containing gear for a single individual. Humans only, for now." path = /obj/structure/closet/crate/secure/gear_loadout/outereyes/single telecrystal_cost = 10 + +/datum/uplink_item/item/gear_loadout/zavodskoi + name = "Zavodskoi Assets (Group)" + desc = "A crate containing gear for a group. The hardsuit and voidsuits are only usable by humans." + path = /obj/structure/closet/crate/secure/gear_loadout/zavodskoi + telecrystal_cost = 35 + +/datum/uplink_item/item/gear_loadout/zavodskoi_single + name = "Zavodskoi Assets (Single)" + desc = "A crate containing gear for a single individual. The voidsuit is only usable by humans." + path = /obj/structure/closet/crate/secure/gear_loadout/zavodskoi/single + telecrystal_cost = 10 diff --git a/code/game/objects/structures/crates_lockers/crates/gear_loadout.dm b/code/game/objects/structures/crates_lockers/crates/gear_loadout.dm index 8ad1621234d..d6d8e773ffd 100644 --- a/code/game/objects/structures/crates_lockers/crates/gear_loadout.dm +++ b/code/game/objects/structures/crates_lockers/crates/gear_loadout.dm @@ -1514,3 +1514,66 @@ new /obj/item/ammo_magazine/c46m/extended(src) new /obj/item/melee/energy/sword/knife(src) new /obj/item/coin/phoron(src) + +/obj/structure/closet/crate/secure/gear_loadout/zavodskoi/fill() + new /obj/item/rig/combat/zavod_heavy(src) + new /obj/item/clothing/suit/space/void/zavodskoi(src) + new /obj/item/clothing/suit/space/void/zavodskoi(src) + new /obj/item/clothing/suit/space/void/zavodskoi(src) + new /obj/item/clothing/suit/space/void/zavodskoi(src) + new /obj/item/clothing/suit/space/void/zavodskoi(src) + new /obj/item/clothing/head/helmet/space/void/zavodskoi(src) + new /obj/item/clothing/head/helmet/space/void/zavodskoi(src) + new /obj/item/clothing/head/helmet/space/void/zavodskoi(src) + new /obj/item/clothing/head/helmet/space/void/zavodskoi(src) + new /obj/item/clothing/head/helmet/space/void/zavodskoi(src) + new /obj/item/gun/projectile/automatic/rifle/z8(src) + new /obj/item/gun/projectile/automatic/rifle/z8(src) + new /obj/item/gun/projectile/automatic/rifle/z8(src) + new /obj/item/ammo_magazine/a556(src) + new /obj/item/ammo_magazine/a556(src) + new /obj/item/ammo_magazine/a556(src) + new /obj/item/ammo_magazine/a556(src) + new /obj/item/ammo_magazine/a556(src) + new /obj/item/ammo_magazine/a556(src) + new /obj/item/gun/energy/rifle/laser/noctiluca(src) + new /obj/item/gun/energy/rifle/laser/noctiluca(src) + new /obj/item/gun/projectile/automatic/rifle/shotgun(src) + new /obj/item/ammo_magazine/assault_shotgun(src) + new /obj/item/ammo_magazine/assault_shotgun(src) + new /obj/item/gun/projectile/pistol(src) + new /obj/item/gun/projectile/pistol(src) + new /obj/item/gun/projectile/pistol(src) + new /obj/item/gun/projectile/pistol(src) + new /obj/item/gun/projectile/pistol(src) + new /obj/item/gun/projectile/pistol(src) + new /obj/item/ammo_magazine/mc9mm(src) + new /obj/item/ammo_magazine/mc9mm(src) + new /obj/item/ammo_magazine/mc9mm(src) + new /obj/item/ammo_magazine/mc9mm(src) + new /obj/item/ammo_magazine/mc9mm(src) + new /obj/item/ammo_magazine/mc9mm(src) + +/obj/structure/closet/crate/secure/gear_loadout/zavodskoi/single/fill() + new /obj/item/clothing/suit/space/void/zavodskoi(src) + new /obj/item/clothing/head/helmet/space/void/zavodskoi(src) + new /obj/item/gun/projectile/automatic/rifle/z8(src) + new /obj/item/ammo_magazine/a556(src) + new /obj/item/ammo_magazine/a556(src) + new /obj/item/gun/projectile/pistol(src) + new /obj/item/ammo_magazine/mc9mm(src) + new /obj/item/ammo_magazine/mc9mm(src) + +/obj/structure/closet/crate/secure/gear_loadout/ninja/zavodskoi + associated_hardsuit = /obj/item/rig/combat/zavod_heavy/ninja + +/obj/structure/closet/crate/secure/gear_loadout/ninja/zavodskoi/fill() + ..() + new /obj/item/clothing/under/rank/security/zavod/zavodsec(src) + new /obj/item/clothing/accessory/holster/hip(src) + new /obj/item/gun/projectile/automatic/rifle/shotgun(src) + new /obj/item/ammo_magazine/assault_shotgun(src) + new /obj/item/ammo_magazine/assault_shotgun(src) + new /obj/item/gun/projectile/pistol(src) + new /obj/item/ammo_magazine/mc9mm(src) + new /obj/item/ammo_magazine/mc9mm(src) diff --git a/code/modules/clothing/spacesuits/rig/hardsuit_token.dm b/code/modules/clothing/spacesuits/rig/hardsuit_token.dm index 5962163f3bf..c5d7e174972 100644 --- a/code/modules/clothing/spacesuits/rig/hardsuit_token.dm +++ b/code/modules/clothing/spacesuits/rig/hardsuit_token.dm @@ -24,7 +24,8 @@ "Einstein Paragon Hardsuit" = /obj/structure/closet/crate/secure/gear_loadout/ninja/einstein, "Vaurca Combat Exoskeleton" = /obj/structure/closet/crate/secure/gear_loadout/ninja/vaurca, "Tupkala Infiltration Hardsuit" = /obj/structure/closet/crate/secure/gear_loadout/ninja/skrell, - "Ceres Lance Bunker Suit" = /obj/structure/closet/crate/secure/gear_loadout/ninja/bunker + "Ceres Lance Bunker Suit" = /obj/structure/closet/crate/secure/gear_loadout/ninja/bunker, + "Zavodskoi Reaper Suit" = /obj/structure/closet/crate/secure/gear_loadout/ninja/zavodskoi ) for(var/hardsuit_option in hardsuit_options) var/crate_path = hardsuit_options[hardsuit_option] diff --git a/code/modules/clothing/spacesuits/rig/suits/combat.dm b/code/modules/clothing/spacesuits/rig/suits/combat.dm index f05069fa3e3..6d33854151e 100644 --- a/code/modules/clothing/spacesuits/rig/suits/combat.dm +++ b/code/modules/clothing/spacesuits/rig/suits/combat.dm @@ -655,10 +655,22 @@ initial_modules = list( /obj/item/rig_module/actuators/combat, /obj/item/rig_module/chem_dispenser/combat, + /obj/item/rig_module/cooling_unit, /obj/item/rig_module/grenade_launcher/frag, /obj/item/rig_module/vision/nvg ) +/obj/item/rig/combat/zavod_heavy/ninja + initial_modules = list( + /obj/item/rig_module/actuators/combat, + /obj/item/rig_module/chem_dispenser/combat, + /obj/item/rig_module/device/drill, + /obj/item/rig_module/vision/thermal, + /obj/item/rig_module/maneuvering_jets, + /obj/item/rig_module/cooling_unit, + /obj/item/rig_module/grenade_launcher/frag, + ) + /obj/item/clothing/suit/space/rig/zavod_heavy var/lights_active = FALSE diff --git a/html/changelogs/dessysalta-22479.yml b/html/changelogs/dessysalta-22479.yml new file mode 100644 index 00000000000..10fe019a137 --- /dev/null +++ b/html/changelogs/dessysalta-22479.yml @@ -0,0 +1,58 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: Dessysalta + +# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again. +delete-after: True + +# Any changes you've made. See valid prefix list above. +# INDENT WITH TWO SPACES. NOT TABS. SPACES. +# SCREW THIS UP AND IT WON'T WORK. +# Also, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Adds Zavod Asset Crates to the uplink, and the suit itself to the hardsuit token for Operatives."