diff --git a/code/datums/uplink/corporate_equipment.dm b/code/datums/uplink/corporate_equipment.dm index 6779d5c35bf..b0d2b06709b 100644 --- a/code/datums/uplink/corporate_equipment.dm +++ b/code/datums/uplink/corporate_equipment.dm @@ -13,14 +13,14 @@ telecrystal_cost = 5 bluecrystal_cost = 5 path = /obj/structure/closet/crate/gear_loadout/zenghu - desc = "A full spaceworthy kit of a Zeng-Hu Pharmaceuticals Dragon-type biohazard containment suit. Only wearable by Humans and Humanoid IPCs. This voidsuit is just as armoured as a mercenary voidsuit, being a bit worse than heavy armour.." + desc = "A full spaceworthy kit of a Zeng-Hu Pharmaceuticals Dragon-type biohazard containment suit. Only wearable by Humans, Skrell and Humanoid IPCs. This voidsuit is just as armoured as a mercenary voidsuit, being a bit worse than heavy armour." /datum/uplink_item/item/corporate_equipment/suit/hephaestus name = "Caiman Drop Suit" telecrystal_cost = 5 bluecrystal_cost = 5 path = /obj/structure/closet/crate/gear_loadout/hephaestus - desc = "A full spaceworthy kit of a Hephaestus Industries Caiman-type terraforming suit. Only wearable by Humans and Humanoid IPCs. This voidsuit is just as armoured as a mercenary voidsuit, being a bit worse than heavy armour.." + desc = "A full spaceworthy kit of a Hephaestus Industries Caiman-type terraforming suit. Only wearable by Humans, Unathi and Humanoid IPCs. This voidsuit is just as armoured as a mercenary voidsuit, being a bit worse than heavy armour." /datum/uplink_item/item/corporate_equipment/suit/einstein name = "Banshee Infiltration Suit" diff --git a/code/game/objects/items/devices/modkit.dm b/code/game/objects/items/devices/modkit.dm index 3eccdc4a904..e87da318658 100644 --- a/code/game/objects/items/devices/modkit.dm +++ b/code/game/objects/items/devices/modkit.dm @@ -314,6 +314,34 @@ /obj/item/clothing/suit/space/void/unathi_pirate/captain = /obj/item/clothing/suit/space/void/unathi_pirate/hiskyn/captain ) +/obj/item/voidsuit_modkit/heph_unathi + name = "\improper Hephaestus Industries voidsuit kit" + desc = "A highly complicated device that allows you to convert a Hephaestus Caiman suit into its Unathi-fitted counterpart and vice versa. Practical!" + desc_info = "This is an OOC item, don't let anyone see it! In order to convert a voidsuit simply click on voidsuit or helmet with this item. \ + The same process can be used to convert the voidsuit back into a regular voidsuit. Make sure not to have a helmet or tank in the suit \ + or else it will be deleted." + w_class = ITEMSIZE_SMALL + suit_options = list( + /obj/item/clothing/head/helmet/space/void/hephaestus = /obj/item/clothing/head/helmet/space/void/hephaestus/unathi, + /obj/item/clothing/suit/space/void/hephaestus = /obj/item/clothing/suit/space/void/hephaestus/unathi, + /obj/item/clothing/head/helmet/space/void/hephaestus/unathi = /obj/item/clothing/head/helmet/space/void/hephaestus, + /obj/item/clothing/suit/space/void/hephaestus/unathi = /obj/item/clothing/suit/space/void/hephaestus + ) + +/obj/item/voidsuit_modkit/zeng_skrell + name = "\improper Zeng-Hu Pharmaceuticals voidsuit kit" + desc = "A highly complicated device that allows you to convert a Zeng-Hu Dragon suit into its Skrell-fitted counterpart and vice versa. Practical!" + desc_info = "This is an OOC item, don't let anyone see it! In order to convert a voidsuit simply click on voidsuit or helmet with this item. \ + The same process can be used to convert the voidsuit back into a regular voidsuit. Make sure not to have a helmet or tank in the suit \ + or else it will be deleted." + w_class = ITEMSIZE_SMALL + suit_options = list( + /obj/item/clothing/head/helmet/space/void/zenghu = /obj/item/clothing/head/helmet/space/void/zenghu/skrell, + /obj/item/clothing/suit/space/void/zenghu = /obj/item/clothing/suit/space/void/zenghu/skrell, + /obj/item/clothing/head/helmet/space/void/zenghu/skrell = /obj/item/clothing/head/helmet/space/void/zenghu, + /obj/item/clothing/suit/space/void/zenghu/skrell = /obj/item/clothing/suit/space/void/zenghu + ) + /obj/item/storage/box/srf name = "srf modkit box" desc = "Contains modkits to convert Solarian voidsuits into a warlord variant." 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 d9d463bafe4..9ec267d0631 100644 --- a/code/game/objects/structures/crates_lockers/crates/gear_loadout.dm +++ b/code/game/objects/structures/crates_lockers/crates/gear_loadout.dm @@ -283,6 +283,7 @@ /obj/structure/closet/crate/gear_loadout/zenghu/fill() new /obj/item/clothing/head/helmet/space/void/zenghu(src) new /obj/item/clothing/suit/space/void/zenghu(src) + new /obj/item/voidsuit_modkit/zeng_skrell(src) new /obj/item/tank/oxygen/red(src) new /obj/item/clothing/shoes/magboots(src) @@ -291,6 +292,7 @@ new /obj/item/clothing/suit/space/void/hephaestus(src) new /obj/item/tank/oxygen/red(src) new /obj/item/clothing/shoes/magboots(src) + new /obj/item/voidsuit_modkit/heph_unathi(src) /obj/structure/closet/crate/gear_loadout/einstein/fill() new /obj/item/clothing/head/helmet/space/void/einstein(src) diff --git a/code/modules/clothing/spacesuits/void/misc.dm b/code/modules/clothing/spacesuits/void/misc.dm index b535d158ca8..132900abff0 100644 --- a/code/modules/clothing/spacesuits/void/misc.dm +++ b/code/modules/clothing/spacesuits/void/misc.dm @@ -309,6 +309,18 @@ desc_extended = "An easily recognized Zeng-Hu Pharmaceuticals biohazard control suit. It is relatively fragile but has very apparent radiation shielding. Most often seen in the hands of post-disaster cleanup teams and private military contractors." refittable = FALSE +/obj/item/clothing/head/helmet/space/void/zenghu/skrell + name = "skrell dragon biohazard suit helmet" + desc = "A remarkably lightweight Zeng-Hu Pharmaceuticals suit sporting excellent ambient radiation protection. This one appears to be fitted for a Skrell wearer." + species_restricted = list(BODYTYPE_SKRELL) + icon_state = "dragonhelm_skrell" + item_state = "dragonhelm_skrell" + +/obj/item/clothing/suit/space/void/zenghu/skrell + name = "skrell dragon biohazard control suit" + desc = "A remarkably lightweight Zeng-Hu Pharmaceuticals suit sporting excellent ambient radiation protection. This one appears to be fitted for a Skrell wearer." + species_restricted = list(BODYTYPE_SKRELL) + //Hephaestus Industries espionage voidsuit /obj/item/clothing/head/helmet/space/void/hephaestus name = "caiman drop suit helmet" @@ -359,6 +371,20 @@ desc_extended = "An easily recognized Hephaestus terraforming suit. Used often on jungle worlds to handle local wildlife and safely deforest areas in hostile environments. It found recent popularity due to its combat effectiveness that resulted in its proliferation in the hands of Hephaestus private military." refittable = FALSE +/obj/item/clothing/head/helmet/space/void/hephaestus/unathi + name = "unathi caiman drop suit helmet" + desc = "A massively heavy helmet, part of a larger terraforming suit assembly. This one looks to have been refitted for an Unathi wearer." + species_restricted = list(BODYTYPE_UNATHI) + icon_state = "caimanhelm_unathi" + item_state = "caimanhelm_unathi" + +/obj/item/clothing/suit/space/void/hephaestus/unathi + name = "caiman drop suit" + desc = "A superheavy Hephaestus-designed terraforming suit, iconic for its usage in orbital drops onto hostile jungle worlds. This one looks to have been refitted for an Unathi wearer." + species_restricted = list(BODYTYPE_UNATHI) + icon_state = "caiman_unathi" + item_state = "caiman_unathi" + //Zavodskoi Interstellar espionage voidsuit /obj/item/clothing/head/helmet/space/void/zavodskoi name = "revenant suit helmet" diff --git a/html/changelogs/RustingWithYou - drip4lizards.yml b/html/changelogs/RustingWithYou - drip4lizards.yml new file mode 100644 index 00000000000..3a8d88d3219 --- /dev/null +++ b/html/changelogs/RustingWithYou - drip4lizards.yml @@ -0,0 +1,41 @@ +################################ +# 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 Unathi and Skrell variants of the Hephaestus and Zeng-Hu voidsuits respectively." diff --git a/icons/obj/clothing/voidsuit/megacorp.dmi b/icons/obj/clothing/voidsuit/megacorp.dmi index 0f706533e9c..a511be9a59d 100644 Binary files a/icons/obj/clothing/voidsuit/megacorp.dmi and b/icons/obj/clothing/voidsuit/megacorp.dmi differ