diff --git a/code/datums/uplink/gear loadout.dm b/code/datums/uplink/gear loadout.dm index 285b1bd8c62..874a6f72ab5 100644 --- a/code/datums/uplink/gear loadout.dm +++ b/code/datums/uplink/gear loadout.dm @@ -168,3 +168,14 @@ desc = "A crate containing gear for a single individual. The voidsuit is only usable by humans." path = /obj/structure/closet/crate/secure/gear_loadout/hammertail/single telecrystal_cost = 10 + +/datum/uplink_item/item/gear_loadout/qukala + name = "Qukala Assets (Group)" + desc = "A crate containing gear for a group. The voidsuits and hardsuit are only usable by Skrell." + path = /obj/structure/closet/crate/gear_loadout/qukala + +/datum/uplink_item/item/gear_loadout/qukala_single + name = "Qukala Assets (Single)" + desc = "A crate containing gear for a single individual. The voidsuit is only usable by Skrell." + path = /obj/structure/closet/crate/gear_loadout/qukala/single + telecrystal_cost = 10 diff --git a/code/datums/uplink/hardsuit_modules.dm b/code/datums/uplink/hardsuit_modules.dm index b930812e67c..c131a7fdccc 100644 --- a/code/datums/uplink/hardsuit_modules.dm +++ b/code/datums/uplink/hardsuit_modules.dm @@ -44,3 +44,9 @@ telecrystal_cost = 1 path = /obj/item/rig_module/cooling_unit desc = "A mounted suit cooling unit for use with hardsuits." + +/datum/uplink_item/item/hardsuit_modules/ai_container + name = "Integrated Intelligence System" + telecrystal_cost = 1 + path = /obj/item/rig_module/ai_container + desc = "A hardsuit module which allows for a support intelligence to be installed." 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 859a721120d..7329a82ea7a 100644 --- a/code/game/objects/structures/crates_lockers/crates/gear_loadout.dm +++ b/code/game/objects/structures/crates_lockers/crates/gear_loadout.dm @@ -835,6 +835,58 @@ new /obj/item/gun/projectile/gauss(src) //1 tungsten slug gun w/spare magazine new /obj/item/ammo_magazine/gauss(src) +/obj/structure/closet/crate/gear_loadout/qukala/fill() + new /obj/item/clothing/under/skrell/qukala(src) + new /obj/item/clothing/under/skrell/qukala(src) + new /obj/item/clothing/under/skrell/qukala(src) + new /obj/item/clothing/under/skrell/qukala(src) + new /obj/item/clothing/suit/space/void/kala(src) + new /obj/item/clothing/suit/space/void/kala(src) + new /obj/item/clothing/suit/space/void/kala/med(src) + new /obj/item/clothing/suit/space/void/kala/engineering(src) + new /obj/item/clothing/suit/space/void/kala/leader(src) + new /obj/item/clothing/head/helmet/space/void/kala(src) + new /obj/item/clothing/head/helmet/space/void/kala(src) + new /obj/item/clothing/head/helmet/space/void/kala/engineering(src) + new /obj/item/clothing/head/helmet/space/void/kala/med(src) + new /obj/item/clothing/head/helmet/space/void/kala/leader(src) + new /obj/item/clothing/suit/storage/vest/kala(src) + new /obj/item/clothing/suit/storage/vest/kala(src) + new /obj/item/clothing/suit/storage/vest/kala(src) + new /obj/item/clothing/suit/storage/vest/kala(src) + new /obj/item/clothing/shoes/jackboots/kala(src) + new /obj/item/clothing/shoes/jackboots/kala(src) + new /obj/item/clothing/shoes/jackboots/kala(src) + new /obj/item/clothing/shoes/jackboots/kala(src) + new /obj/item/rig/skrell/equipped/merc(src) + new /obj/item/gun/energy/psipistol(src) + new /obj/item/gun/energy/psipistol(src) + new /obj/item/gun/energy/psipistol(src) + new /obj/item/gun/energy/psipistol(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/qukala(src) + new /obj/item/gun/energy/rifle/laser/qukala(src) + new /obj/item/gun/energy/rifle/laser/qukala(src) + new /obj/item/gun/energy/rifle/laser/qukala(src) + new /obj/item/clothing/gloves/kala(src) + new /obj/item/clothing/gloves/kala(src) + new /obj/item/clothing/gloves/kala(src) + new /obj/item/clothing/gloves/kala(src) + +/obj/structure/closet/crate/gear_loadout/qukala/single/fill() + new /obj/item/clothing/under/skrell/qukala(src) + new /obj/item/clothing/gloves/kala(src) + new /obj/item/clothing/accessory/holster/hip(src) + new /obj/item/gun/energy/rifle/laser/qukala(src) + new /obj/item/gun/energy/psipistol(src) + new /obj/item/clothing/suit/storage/vest/kala(src) + new /obj/item/clothing/suit/space/void/kala(src) + new /obj/item/clothing/head/helmet/space/void/kala(src) + new /obj/item/clothing/shoes/jackboots/kala(src) + //ninja stuff /obj/structure/closet/crate/secure/gear_loadout/ninja var/associated_hardsuit = /obj/item/rig/light/ninja @@ -959,3 +1011,46 @@ 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/einstein + associated_hardsuit = /obj/item/rig/merc/einstein/ninja + +/obj/structure/closet/crate/secure/gear_loadout/ninja/einstein/fill() + ..() + new /obj/item/clothing/under/rank/einstein(src) + new /obj/item/clothing/accessory/holster/hip(src) + new /obj/item/gun/energy/rifle(src) + new /obj/item/gun/projectile/pistol(src) + new /obj/item/suppressor(src) + new /obj/item/ammo_magazine/mc9mm(src) + new /obj/item/ammo_magazine/mc9mm(src) + +/obj/structure/closet/crate/secure/gear_loadout/ninja/vaurca + associated_hardsuit = /obj/item/rig/vaurca + +/obj/structure/closet/crate/secure/gear_loadout/ninja/vaurca/fill() + var/obj/item/clothing/under/vaurca/clothes = new(src) + var/obj/item/clothing/shoes/vaurca/shoes = new(src) + var/obj/item/clothing/glasses/sunglasses/blinders/blinders = new(src) + clothes.color = COLOR_GRAY20 + shoes.color = COLOR_GRAY20 + blinders.color = COLOR_GRAY20 + + new /obj/item/clothing/accessory/holster/hip(src) + new /obj/item/clothing/mask/gas/vaurca/tactical(src) + new /obj/item/melee/energy/vaurca(src) + new /obj/item/reagent_containers/food/snacks/koisbar(src) + new /obj/item/reagent_containers/food/snacks/koisbar(src) + new /obj/item/reagent_containers/food/snacks/koisbar(src) + new /obj/item/gun/energy/vaurca/blaster(src) + new /obj/item/device/augment_implanter/hivenet_warfare(src) + +/obj/structure/closet/crate/secure/gear_loadout/ninja/skrell + associated_hardsuit = /obj/item/rig/skrell/tup/ninja + +/obj/structure/closet/crate/secure/gear_loadout/ninja/skrell/fill() + new /obj/item/clothing/accessory/holster/hip(src) + new /obj/item/clothing/under/skrell/tupkala(src) + new /obj/item/gun/energy/rifle/laser/qukala(src) + new /obj/item/clothing/shoes/jackboots/kala(src) + new /obj/item/gun/energy/psipistol(src) diff --git a/code/modules/clothing/spacesuits/rig/hardsuit_token.dm b/code/modules/clothing/spacesuits/rig/hardsuit_token.dm index ea0b3c50795..b7d4bcfc4f5 100644 --- a/code/modules/clothing/spacesuits/rig/hardsuit_token.dm +++ b/code/modules/clothing/spacesuits/rig/hardsuit_token.dm @@ -20,7 +20,10 @@ "Cyberwarfare Suit" = /obj/structure/closet/crate/secure/gear_loadout/ninja/hacker, "Advanced Mobility Combat Suit" = /obj/structure/closet/crate/secure/gear_loadout/ninja/frontier, "Crimson Hardsuit" = /obj/structure/closet/crate/secure/gear_loadout/ninja/crimson, - "Rhino Suit" = /obj/structure/closet/crate/secure/gear_loadout/ninja/rhino + "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 ) for(var/hardsuit_option in hardsuit_options) var/crate_path = hardsuit_options[hardsuit_option] diff --git a/code/modules/clothing/spacesuits/rig/modules/combat.dm b/code/modules/clothing/spacesuits/rig/modules/combat.dm index 05d3ae5fffa..1e11f61a87f 100644 --- a/code/modules/clothing/spacesuits/rig/modules/combat.dm +++ b/code/modules/clothing/spacesuits/rig/modules/combat.dm @@ -408,3 +408,11 @@ playsound(H, 'sound/magic/LightningShock.ogg', 75, 1) tesla_zap(H, 5, 5000) return TRUE + +/obj/item/rig_module/mounted/skrell_gun + name = "mounted tqi-qop carbine" + desc = "A shoulder-mounted cell-powered tqi-qop carbine." + icon_state = "pulse" + interface_name = "mounted tqi-qop carbine" + interface_desc = "A shoulder-mounted cell-powered tqi-qop carbine." + gun_type = /obj/item/gun/energy/gun/qukala/mounted diff --git a/code/modules/clothing/spacesuits/rig/suits/alien.dm b/code/modules/clothing/spacesuits/rig/suits/alien.dm index d6d5bfa453c..14080a8e6c2 100644 --- a/code/modules/clothing/spacesuits/rig/suits/alien.dm +++ b/code/modules/clothing/spacesuits/rig/suits/alien.dm @@ -116,8 +116,8 @@ icon_state = "vaurca_rig" armor = list( melee = ARMOR_MELEE_MAJOR, - bullet = ARMOR_BALLISTIC_PISTOL, - laser = ARMOR_LASER_HEAVY, + bullet = ARMOR_BALLISTIC_MAJOR, + laser = ARMOR_LASER_RIFLE, energy = ARMOR_ENERGY_SHIELDED, bomb = ARMOR_BOMB_SHIELDED, bio = ARMOR_BIO_SHIELDED, @@ -151,6 +151,17 @@ /obj/item/rig/vaurca/minimal initial_modules = list(/obj/item/rig_module/chem_dispenser/vaurca) +/obj/item/rig/vaurca/ninja + initial_modules = list( + /obj/item/rig_module/actuators/combat, + /obj/item/rig_module/vision/thermal, + /obj/item/rig_module/device/flash, + /obj/item/rig_module/chem_dispenser/vaurca, + /obj/item/rig_module/boring, + /obj/item/rig_module/maneuvering_jets, + /obj/item/rig_module/device/door_hack + ) + /obj/item/clothing/head/helmet/space/rig/vaurca light_overlay = "helmet_light_dual_green" light_color = "#3e7c3e" diff --git a/code/modules/clothing/spacesuits/rig/suits/combat.dm b/code/modules/clothing/spacesuits/rig/suits/combat.dm index 5d218da0eb5..32e71b49022 100644 --- a/code/modules/clothing/spacesuits/rig/suits/combat.dm +++ b/code/modules/clothing/spacesuits/rig/suits/combat.dm @@ -413,7 +413,6 @@ /obj/item/rig/jinxiang/ninja initial_modules = list( - /obj/item/rig_module/ai_container, /obj/item/rig_module/vision/thermal, /obj/item/rig_module/actuators/combat, /obj/item/rig_module/maneuvering_jets, diff --git a/code/modules/clothing/spacesuits/rig/suits/merc.dm b/code/modules/clothing/spacesuits/rig/suits/merc.dm index 14c02c21ff6..a609583db18 100644 --- a/code/modules/clothing/spacesuits/rig/suits/merc.dm +++ b/code/modules/clothing/spacesuits/rig/suits/merc.dm @@ -125,7 +125,7 @@ icon_state = "paragon" icon_supported_species_tags = null allowed_module_types = MODULE_GENERAL | MODULE_LIGHT_COMBAT | MODULE_HEAVY_COMBAT | MODULE_SPECIAL | MODULE_MEDICAL | MODULE_UTILITY - species_restricted = list(BODYTYPE_HUMAN, BODYTYPE_IPC, BODYTYPE_IPC_BISHOP, BODYTYPE_IPC_ZENGHU) + species_restricted = list(BODYTYPE_HUMAN, BODYTYPE_IPC_INDUSTRIAL, BODYTYPE_IPC_BISHOP, BODYTYPE_IPC_ZENGHU) initial_modules = list( /obj/item/rig_module/power_sink, @@ -137,3 +137,19 @@ /obj/item/rig_module/vision/multi, /obj/item/rig_module/electrowarfare_suite ) + +/obj/item/rig/merc/einstein/ninja + initial_modules = list( + /obj/item/rig_module/power_sink, + /obj/item/rig_module/mounted/ion, + /obj/item/rig_module/cooling_unit, + /obj/item/rig_module/actuators/combat, + /obj/item/rig_module/maneuvering_jets, + /obj/item/rig_module/ai_container, + /obj/item/rig_module/vision/multi, + /obj/item/rig_module/electrowarfare_suite, + /obj/item/rig_module/device/door_hack, + /obj/item/rig_module/mounted/egun, + /obj/item/rig_module/ai_container, + /obj/item/rig_module/chem_dispenser/combat + ) diff --git a/code/modules/clothing/spacesuits/rig/suits/skrell.dm b/code/modules/clothing/spacesuits/rig/suits/skrell.dm index aa184b3bb0f..2cd22db885f 100644 --- a/code/modules/clothing/spacesuits/rig/suits/skrell.dm +++ b/code/modules/clothing/spacesuits/rig/suits/skrell.dm @@ -3,46 +3,48 @@ light_color = LIGHT_COLOR_CYAN /obj/item/rig/skrell - name = "nralakk suit control module" - desc = "A suit control module designed by the Nralakk Federation for JFSF operations. It is designed to be sleek and agile, equipped with best protection and technology the Federation has to offer for its elite." + name = "qukala assault hardsuit control module" + 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." icon = 'icons/clothing/rig/nralakk.dmi' icon_state = "nralakk_rig" - suit_type = "nralakk suit" armor = list( - melee = ARMOR_MELEE_VERY_HIGH, - bullet = ARMOR_BALLISTIC_RIFLE, - laser = ARMOR_LASER_AP, - energy = ARMOR_ENERGY_RESISTANT, + 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_SHIELDED - ) + rad = ARMOR_RAD_SMALL + ) siemens_coefficient = 0.1 emp_protection = 30 vision_restriction = 0 slowdown = 0 offline_slowdown = 3 vision_restriction = TINT_NONE - species_restricted = list("Skrell") + species_restricted = list(BODYTYPE_SKRELL) helm_type = /obj/item/clothing/head/helmet/space/rig/skrell 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,/obj/item/material/twohanded/fireaxe) + allowed_module_types = MODULE_GENERAL | MODULE_LIGHT_COMBAT | MODULE_HEAVY_COMBAT | MODULE_SPECIAL + +/obj/item/rig/skrell/equipped + req_access = list(access_skrell) initial_modules = list( - /obj/item/rig_module/ai_container, /obj/item/rig_module/maneuvering_jets, /obj/item/rig_module/grenade_launcher, - /obj/item/rig_module/vision/multi, - /obj/item/rig_module/mounted/pulse, + /obj/item/rig_module/vision/thermal, + /obj/item/rig_module/mounted/ion, /obj/item/rig_module/chem_dispenser/combat, /obj/item/rig_module/chem_dispenser/injector, - /obj/item/rig_module/device/drill, - /obj/item/rig_module/device/rfd_c, /obj/item/rig_module/datajack, - /obj/item/rig_module/actuators/combat + /obj/item/rig_module/actuators/combat, + /obj/item/rig_module/mounted/skrell_gun ) - allowed_module_types = MODULE_GENERAL | MODULE_LIGHT_COMBAT | MODULE_HEAVY_COMBAT | MODULE_SPECIAL +/obj/item/rig/skrell/equipped/merc + req_access = list(access_syndicate) /obj/item/clothing/head/helmet/space/rig/skrell/tup light_overlay = "helmet_light_tadpole" @@ -51,24 +53,19 @@ light_overlay = "tup2_rig_helmetlight" /obj/item/rig/skrell/tup - name = "outdated tupkala suit control module" - desc = "A suit control module designed by the Nralakk Federation for Tup operations. The best of the best, albeit outdated now." + name = "tupkala infiltration suit control module" + desc = "An old yet reliable suit control module, designed by the Nralakk Federation for clandestine operations. The best of the best, albeit outdated now." icon = 'icons/clothing/rig/tup.dmi' icon_state = "tup_rig" suit_type = "tup suit" - armor = list( - melee = ARMOR_MELEE_VERY_HIGH, - bullet = ARMOR_BALLISTIC_RIFLE, - laser = ARMOR_LASER_RIFLE, - energy = ARMOR_ENERGY_STRONG, - bomb = ARMOR_BOMB_RESISTANT, - bio = ARMOR_BIO_SHIELDED, - rad = ARMOR_RAD_SHIELDED - ) emp_protection = 95 helm_type = /obj/item/clothing/head/helmet/space/rig/skrell/tup + allowed_module_types = MODULE_GENERAL | MODULE_LIGHT_COMBAT | MODULE_HEAVY_COMBAT | MODULE_SPECIAL + +/obj/item/rig/skrell/tup/equipped + req_access = list(access_skrell) initial_modules = list( /obj/item/rig_module/ai_container, /obj/item/rig_module/maneuvering_jets, @@ -84,10 +81,47 @@ /obj/item/rig_module/teleporter/skrell ) - allowed_module_types = MODULE_GENERAL | MODULE_LIGHT_COMBAT | MODULE_HEAVY_COMBAT | MODULE_SPECIAL +/obj/item/rig/skrell/tup/ninja + initial_modules = list( + /obj/item/rig_module/maneuvering_jets, + /obj/item/rig_module/vision/thermal, + /obj/item/rig_module/chem_dispenser/combat, + /obj/item/rig_module/chem_dispenser/injector, + /obj/item/rig_module/datajack, + /obj/item/rig_module/actuators/combat, + /obj/item/rig_module/teleporter/skrell, + /obj/item/rig_module/mounted/skrell_gun, + /obj/item/rig_module/stealth_field + ) /obj/item/rig/skrell/tup/modern name = "tupkala suit control module" desc = "This is the suit control module for the Tupkala RIG. It's one of the most advanced pieces of technology in the Spur." icon_state = "tup2_rig" helm_type = /obj/item/clothing/head/helmet/space/rig/skrell/tup/modern + armor = list( + melee = ARMOR_MELEE_MAJOR, + bullet = ARMOR_BALLISTIC_RIFLE, + laser = ARMOR_LASER_RIFLE, + energy = ARMOR_ENERGY_STRONG, + bomb = ARMOR_BOMB_RESISTANT, + bio = ARMOR_BIO_SHIELDED, + rad = ARMOR_RAD_SHIELDED + ) + +/obj/item/rig/skrell/tup/modern/equipped + req_access = list(access_skrell) + initial_modules = list( + /obj/item/rig_module/ai_container, + /obj/item/rig_module/maneuvering_jets, + /obj/item/rig_module/grenade_launcher, + /obj/item/rig_module/vision/multi, + /obj/item/rig_module/mounted/pulse, + /obj/item/rig_module/chem_dispenser/combat, + /obj/item/rig_module/chem_dispenser/injector, + /obj/item/rig_module/device/drill, + /obj/item/rig_module/device/rfd_c, + /obj/item/rig_module/datajack, + /obj/item/rig_module/actuators/combat, + /obj/item/rig_module/teleporter/skrell + ) diff --git a/code/modules/projectiles/guns/energy/nuclear.dm b/code/modules/projectiles/guns/energy/nuclear.dm index ea65b5f3b83..4aafec316d1 100644 --- a/code/modules/projectiles/guns/energy/nuclear.dm +++ b/code/modules/projectiles/guns/energy/nuclear.dm @@ -273,8 +273,8 @@ ) /obj/item/gun/energy/gun/qukala - name = "tqi-qop rifle" - desc = "The Tqi-Qop Rifle is the main weapon of the Qukala. Its compact light frame and excellent ammo capacity make it a superb weapon for the Skrell." + name = "tqi-qop carbine" + desc = "The Tqi-Qop Carbine is the main weapon of the Qukala. Its compact light frame and excellent ammo capacity make it a superb weapon for the Skrell." desc_extended = "" icon = 'icons/obj/item/gun/energy/gun/qukala.dmi' icon_state = "qukalagun" @@ -298,6 +298,12 @@ has_item_ratio = FALSE +/obj/item/gun/energy/gun/qukala/mounted + self_recharge = 1 + use_external_power = 1 + recharge_time = 10 + can_turret = 0 + /obj/item/gun/energy/psipistol name = "psionic pistol" desc = "A pistol that utilises psionics. It's made from a lightweight alloy." diff --git a/html/changelogs/RustingWithYou - ninjastuff.yml b/html/changelogs/RustingWithYou - ninjastuff.yml new file mode 100644 index 00000000000..915099c9de7 --- /dev/null +++ b/html/changelogs/RustingWithYou - ninjastuff.yml @@ -0,0 +1,44 @@ +################################ +# 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 +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: RustingWithYou + +# 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, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries. +# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Adds a Qukala hardsuit and gear crates." + - rscadd: "Adds Einstein, Tupkala and Vaurca ninja hardsuits." + - tweak: "Changes Skrell and Vaurca hardsuit armor values to be more usable in normal gameplay." + - tweak: "Removes AI containers from anti-AI factions' hardsuits and adds AI containers to the uplink." diff --git a/icons/obj/hardsuit_token.dmi b/icons/obj/hardsuit_token.dmi index 2f943182693..43e4c316ae7 100644 Binary files a/icons/obj/hardsuit_token.dmi and b/icons/obj/hardsuit_token.dmi differ