diff --git a/code/datums/uplink/gear loadout.dm b/code/datums/uplink/gear loadout.dm index 6fbb0b384be..a3cc2c52d2a 100644 --- a/code/datums/uplink/gear loadout.dm +++ b/code/datums/uplink/gear loadout.dm @@ -57,6 +57,17 @@ path = /obj/structure/closet/crate/secure/gear_loadout/dominia/single telecrystal_cost = 10 +/datum/uplink_item/item/gear_loadout/ceres + name = "Ceres Lance Assets (Group)" + desc = "A crate containing gear for a group. The voidsuits are only usable by humans and unathi. The hardsuit is only usable by humans." + path = /obj/structure/closet/crate/gear_loadout/ceres + +/datum/uplink_item/item/gear_loadout/ceres_single + name = "Ceres Lance Assets (Single)" + desc = "A crate containing gear for a single individual. The voidsuit is only usable by humans and unathi." + path = /obj/structure/closet/crate/gear_loadout/ceres/single + telecrystal_cost = 10 + /datum/uplink_item/item/gear_loadout/cowboys name = "Frontier Cowboys (Group)" desc = "A crate containing gear for a group. Yeehaw." diff --git a/code/datums/uplink/hardsuits_and_modules.dm b/code/datums/uplink/hardsuits_and_modules.dm index 53a941a4da9..5c277a8aade 100644 --- a/code/datums/uplink/hardsuits_and_modules.dm +++ b/code/datums/uplink/hardsuits_and_modules.dm @@ -145,6 +145,13 @@ path = /obj/item/rig/skrell desc = "A Nralakk-manufactured combat hardsuit, designed for use by elite operatives of the Qukala. Due to their expense and classified design, these suits are rarely seen outside of Qukala hands. Only wearable by skrell." +/datum/uplink_item/item/hardsuit_modules/suit/bunker + name = "Ceres Lance Bunker Suit" + telecrystal_cost = 8 + bluecrystal_cost = 8 + path = /obj/item/rig/bunker/nerfed + desc = "A powerful niche-function hardsuit utilized by Ceres' Lance to apprehend synthetics. This is a lighter version with more standard hardsuit plating. Only wearable by humans." + /datum/uplink_item/item/hardsuit_modules/suit/vaurca name = "Vaurca Combat Exoskeleton" telecrystal_cost = 10 diff --git a/code/game/objects/items/devices/modkit.dm b/code/game/objects/items/devices/modkit.dm index 9e7b367540e..04a4be6eea9 100644 --- a/code/game/objects/items/devices/modkit.dm +++ b/code/game/objects/items/devices/modkit.dm @@ -210,6 +210,16 @@ /obj/item/rig_assembly/industrial = /obj/item/rig_assembly/industrial/himeo ) +/obj/item/voidsuit_modkit/ceres_lance_unathi + name = "\improper Ceres' Lance voidsuit kit" + desc = "A highly complicated device that allows you to convert a Ceres' Lancer suit into its Unathi-fitted counterpart and vice versa. Practical!" + suit_options = list( + /obj/item/clothing/head/helmet/space/void/lancer = /obj/item/clothing/head/helmet/space/void/lancer/unathi, + /obj/item/clothing/suit/space/void/lancer = /obj/item/clothing/suit/space/void/lancer/unathi, + /obj/item/clothing/head/helmet/space/void/lancer/unathi = /obj/item/clothing/head/helmet/space/void/lancer, + /obj/item/clothing/suit/space/void/lancer/unathi = /obj/item/clothing/suit/space/void/lancer + ) + /obj/item/voidsuit_modkit/dominianvoid name = "dominian voidsman's voidsuit kit" desc = "A highly complicated device that allows you to convert a Dominian prejoroub combat suit into its voidsman counterpart. Practical!" 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 b06587c01ee..db4014cee95 100644 --- a/code/game/objects/structures/crates_lockers/crates/gear_loadout.dm +++ b/code/game/objects/structures/crates_lockers/crates/gear_loadout.dm @@ -574,6 +574,54 @@ new /obj/item/ammo_magazine/mc9mm(src) new /obj/item/device/modkit/multi_species(src) +/obj/structure/closet/crate/gear_loadout/ceres/fill() + new /obj/item/rig/bunker/nerfed/equipped(src) + new /obj/item/clothing/head/helmet/space/void/lancer(src) + new /obj/item/clothing/head/helmet/space/void/lancer(src) + new /obj/item/clothing/head/helmet/space/void/lancer(src) + new /obj/item/clothing/head/helmet/space/void/lancer(src) + new /obj/item/clothing/suit/space/void/lancer(src) + new /obj/item/clothing/suit/space/void/lancer(src) + new /obj/item/clothing/suit/space/void/lancer(src) + new /obj/item/clothing/suit/space/void/lancer(src) + new /obj/item/clothing/under/lance(src) + new /obj/item/clothing/under/lance(src) + new /obj/item/clothing/under/lance(src) + new /obj/item/clothing/under/lance(src) + new /obj/item/clothing/accessory/holster/hip(src) + new /obj/item/clothing/accessory/holster/hip(src) + new /obj/item/clothing/accessory/holster/hip(src) + new /obj/item/clothing/accessory/holster/hip(src) + new /obj/item/gun/energy/rifle/laser(src) + new /obj/item/gun/energy/rifle/laser(src) + new /obj/item/gun/energy/rifle/laser(src) + new /obj/item/gun/energy/rifle/laser(src) + new /obj/item/gun/energy/repeater/pistol(src) + new /obj/item/gun/energy/repeater/pistol(src) + new /obj/item/gun/energy/repeater/pistol(src) + new /obj/item/gun/energy/repeater/pistol(src) + new /obj/item/gun/energy/rifle/ionrifle(src) + new /obj/item/gun/projectile/peac(src) + new /obj/item/ammo_casing/peac(src) + new /obj/item/ammo_casing/peac(src) + new /obj/item/ammo_casing/peac/he(src) + new /obj/item/ammo_casing/peac/he(src) + new /obj/item/recharger_backpack/high(src) + new /obj/item/recharger_backpack/high(src) + new /obj/item/recharger_backpack/high(src) + new /obj/item/recharger_backpack/high(src) + new /obj/item/voidsuit_modkit/ceres_lance_unathi(src) + +/obj/structure/closet/crate/gear_loadout/ceres/single/fill() + new /obj/item/clothing/head/helmet/space/void/lancer(src) + new /obj/item/clothing/suit/space/void/lancer(src) + new /obj/item/clothing/under/lance(src) + new /obj/item/clothing/accessory/holster/hip(src) + new /obj/item/gun/energy/rifle/laser(src) + new /obj/item/gun/energy/repeater/pistol(src) + new /obj/item/recharger_backpack/high(src) + new /obj/item/voidsuit_modkit/ceres_lance_unathi(src) + /obj/structure/closet/crate/secure/gear_loadout/hegemony/fill() new/obj/item/clothing/under/unathi/izweski(src) new/obj/item/clothing/under/unathi/izweski(src) @@ -1339,6 +1387,18 @@ new /obj/item/ammo_magazine/mc9mm(src) new /obj/item/ammo_magazine/mc9mm(src) +/obj/structure/closet/crate/secure/gear_loadout/ninja/bunker + associated_hardsuit = /obj/item/rig/bunker/ninja + +/obj/structure/closet/crate/secure/gear_loadout/ninja/bunker/fill() + ..() + new /obj/item/clothing/under/lance(src) + new /obj/item/clothing/accessory/holster/hip(src) + new /obj/item/gun/energy/rifle/laser(src) + new /obj/item/gun/projectile/pistol/super_heavy(src) + new /obj/item/ammo_magazine/super_heavy(src) + new /obj/item/ammo_magazine/super_heavy(src) + /obj/structure/closet/crate/secure/gear_loadout/ninja/vaurca associated_hardsuit = /obj/item/rig/vaurca diff --git a/code/modules/clothing/spacesuits/rig/hardsuit_token.dm b/code/modules/clothing/spacesuits/rig/hardsuit_token.dm index e208b047d07..5962163f3bf 100644 --- a/code/modules/clothing/spacesuits/rig/hardsuit_token.dm +++ b/code/modules/clothing/spacesuits/rig/hardsuit_token.dm @@ -23,7 +23,8 @@ "Rhino Suit" = /obj/structure/closet/crate/secure/gear_loadout/ninja/rhino, "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 + "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 ) 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 0bfa0d5cb13..f889073f1b7 100644 --- a/code/modules/clothing/spacesuits/rig/suits/combat.dm +++ b/code/modules/clothing/spacesuits/rig/suits/combat.dm @@ -431,6 +431,45 @@ /obj/item/rig_module/fabricator/energy_net ) +/obj/item/rig/bunker/ninja // Ninjas have breachers, so it was approved they can have the unnerfed version. + initial_modules = list( + /obj/item/rig_module/actuators/combat, + /obj/item/rig_module/vision/thermal, + /obj/item/rig_module/maneuvering_jets, + /obj/item/rig_module/recharger, + /obj/item/rig_module/mounted/ion, + /obj/item/rig_module/fabricator/energy_net, + /obj/item/rig_module/device/drill, + ) + +/obj/item/rig/bunker/nerfed + name = "bunker suit control module" + desc = "A powerful niche-function hardsuit utilized by Ceres' Lance to apprehend synthetics. This is a lighter version with more standard hardsuit plating." + armor = list( + MELEE = ARMOR_MELEE_MAJOR, + BULLET = ARMOR_BALLISTIC_MAJOR, + LASER = ARMOR_LASER_MEDIUM, + ENERGY = ARMOR_ENERGY_SMALL, + BOMB = ARMOR_BOMB_PADDED, + BIO = ARMOR_BIO_SHIELDED, + RAD = ARMOR_RAD_SMALL + ) + offline_vision_restriction = TINT_HEAVY + slowdown = 1 + + allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/gun,/obj/item/ammo_magazine,/obj/item/ammo_casing,/obj/item/melee/baton,/obj/item/melee/energy/sword,/obj/item/handcuffs) + + allowed_module_types = MODULE_GENERAL | MODULE_LIGHT_COMBAT | MODULE_HEAVY_COMBAT | MODULE_SPECIAL | MODULE_MEDICAL | MODULE_UTILITY | MODULE_VAURCA + +/obj/item/rig/bunker/nerfed/equipped + initial_modules = list( + /obj/item/rig_module/actuators/combat, + /obj/item/rig_module/vision/thermal, + /obj/item/rig_module/maneuvering_jets, + /obj/item/rig_module/recharger, + /obj/item/rig_module/mounted/ion + ) + /obj/item/rig/jinxiang name = "jinxiang-pattern combat suit control module" desc = "An off-shoot of the core Bunker Suit design, utilized by the Imperial Dominian military and painted accordingly. This is a powerful suit specializing in melee confrontations." diff --git a/html/changelogs/ceres-kit.yml b/html/changelogs/ceres-kit.yml new file mode 100644 index 00000000000..2884243e6c9 --- /dev/null +++ b/html/changelogs/ceres-kit.yml @@ -0,0 +1,60 @@ +################################ +# 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: UltraBigRat + +# 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: "Added ninja version for bunker suit, aswell aswell as a lighter bunker suit version." + - rscadd: "Added ceres lance gear loadouts to the uplink, aswell as a nerfed bunker suit to the uplink." + - rscadd: "Added a modkit for ceres lance voidsuits."