From bc66a212d771eef33ae88445ebe4462ee25bde17 Mon Sep 17 00:00:00 2001 From: RustingWithYou <63625389+RustingWithYou@users.noreply.github.com> Date: Tue, 19 Dec 2023 00:36:32 +1300 Subject: [PATCH] Hephaestus Security Ship & Corporate Voidsuit Tweaks (#17962) * hephaestus security ship * fuck off * welcome mesgaes * lattice hell * damn you kaizr * cabinet --- aurorastation.dme | 3 + code/game/objects/items/devices/modkit.dm | 28 - .../crates_lockers/crates/gear_loadout.dm | 2 - code/modules/clothing/spacesuits/void/misc.dm | 46 +- .../RustingWithYou - seenanyunionsaround.yml | 42 + icons/obj/clothing/voidsuit/megacorp.dmi | Bin 6555 -> 6546 bytes maps/away/ships/heph/cyclops/cyclops.dmm | 1 - .../ships/heph/heph_security/heph_security.dm | 116 + .../heph/heph_security/heph_security.dmm | 72131 ++++++++++++++++ .../heph/heph_security/heph_security_areas.dm | 71 + .../heph_security/heph_security_ghostroles.dm | 74 + 11 files changed, 72453 insertions(+), 61 deletions(-) create mode 100644 html/changelogs/RustingWithYou - seenanyunionsaround.yml create mode 100644 maps/away/ships/heph/heph_security/heph_security.dm create mode 100644 maps/away/ships/heph/heph_security/heph_security.dmm create mode 100644 maps/away/ships/heph/heph_security/heph_security_areas.dm create mode 100644 maps/away/ships/heph/heph_security/heph_security_ghostroles.dm diff --git a/aurorastation.dme b/aurorastation.dme index e2ea5f54046..d9ff073a87e 100644 --- a/aurorastation.dme +++ b/aurorastation.dme @@ -3620,6 +3620,9 @@ #include "maps\away\ships\heph\cyclops\cyclops_ghostroles.dm" #include "maps\away\ships\heph\cyclops\cyclops_mining_areas.dm" #include "maps\away\ships\heph\cyclops\cyclops_mining_ship.dm" +#include "maps\away\ships\heph\heph_security\heph_security.dm" +#include "maps\away\ships\heph\heph_security\heph_security_areas.dm" +#include "maps\away\ships\heph\heph_security\heph_security_ghostroles.dm" #include "maps\away\ships\iac\iac_rescue_ship.dm" #include "maps\away\ships\iac\iac_rescue_ship_ghostroles.dm" #include "maps\away\ships\kataphracts\kataphract_areas.dm" diff --git a/code/game/objects/items/devices/modkit.dm b/code/game/objects/items/devices/modkit.dm index af6ca15a6af..913708e1d20 100644 --- a/code/game/objects/items/devices/modkit.dm +++ b/code/game/objects/items/devices/modkit.dm @@ -314,34 +314,6 @@ /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/voidsuit_modkit/nexus name = "\improper Nexus voidsuit kit" desc = "A highly complicated device that allows you to convert a NanoTrasen hardsuit into its Nexus variant. Wow!" 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 b7c8500f1ea..859a721120d 100644 --- a/code/game/objects/structures/crates_lockers/crates/gear_loadout.dm +++ b/code/game/objects/structures/crates_lockers/crates/gear_loadout.dm @@ -294,7 +294,6 @@ /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) @@ -308,7 +307,6 @@ 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/suit/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 27c4a8cb731..11845fe9632 100644 --- a/code/modules/clothing/spacesuits/void/misc.dm +++ b/code/modules/clothing/spacesuits/void/misc.dm @@ -324,11 +324,14 @@ rad = ARMOR_RAD_SMALL ) siemens_coefficient = 0.35 - species_restricted = list(BODYTYPE_HUMAN, BODYTYPE_IPC_INDUSTRIAL, BODYTYPE_IPC_ZENGHU, BODYTYPE_IPC_BISHOP) + species_restricted = list(BODYTYPE_HUMAN, BODYTYPE_IPC_INDUSTRIAL, BODYTYPE_IPC_ZENGHU, BODYTYPE_IPC_BISHOP, BODYTYPE_SKRELL) light_overlay = "helmet_light_dragon" brightness_on = 6 light_color = "#7ffbf7" desc_extended = "An easily recognized Zeng-Hu Pharmaceuticals biohazard control suit helmet. Its bug-eyed goggle visor design is unique among its class, alongside cutting-edge radiation protection." + icon_auto_adapt = TRUE + icon_supported_species_tags = list("skr") + icon_species_in_hand = TRUE refittable = FALSE /obj/item/clothing/suit/space/void/zenghu @@ -351,22 +354,13 @@ ) 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) siemens_coefficient = 0.35 - species_restricted = list(BODYTYPE_HUMAN, BODYTYPE_IPC_INDUSTRIAL, BODYTYPE_IPC_ZENGHU, BODYTYPE_IPC_BISHOP) + species_restricted = list(BODYTYPE_HUMAN, BODYTYPE_IPC_INDUSTRIAL, BODYTYPE_IPC_ZENGHU, BODYTYPE_IPC_BISHOP, BODYTYPE_SKRELL) 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." + icon_auto_adapt = TRUE + icon_supported_species_tags = list("skr") + icon_species_in_hand = TRUE 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" @@ -386,11 +380,14 @@ rad = ARMOR_RAD_SMALL ) siemens_coefficient = 0.35 - species_restricted = list(BODYTYPE_HUMAN) + species_restricted = list(BODYTYPE_HUMAN, BODYTYPE_IPC_INDUSTRIAL, BODYTYPE_IPC_BISHOP, BODYTYPE_IPC_ZENGHU, BODYTYPE_UNATHI) light_overlay = "helmet_light_caiman" brightness_on = 6 light_color = "#ffce01" desc_extended = "An easily recognized Hephaestus terraforming suit helmet. Its low, protruding brow and heavy plating is useful in the event you happen to be cutting down things. Mostly trees. Hopefully trees." + icon_supported_species_tags = list("una") + icon_auto_adapt = TRUE + icon_species_in_hand = TRUE refittable = FALSE /obj/item/clothing/suit/space/void/hephaestus @@ -413,24 +410,13 @@ ) 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) siemens_coefficient = 0.35 - species_restricted = list(BODYTYPE_HUMAN) + species_restricted = list(BODYTYPE_HUMAN, BODYTYPE_UNATHI, BODYTYPE_IPC_BISHOP, BODYTYPE_IPC_INDUSTRIAL, BODYTYPE_IPC_ZENGHU) 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." + icon_supported_species_tags = list("una") + icon_auto_adapt = TRUE + icon_species_in_hand = TRUE 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 - seenanyunionsaround.yml b/html/changelogs/RustingWithYou - seenanyunionsaround.yml new file mode 100644 index 00000000000..2682f9ac583 --- /dev/null +++ b/html/changelogs/RustingWithYou - seenanyunionsaround.yml @@ -0,0 +1,42 @@ +################################ +# 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 Hephaestus asset protection ship." + - tweak: "Megacorporate voidsuits no longer use modkits for species changes." diff --git a/icons/obj/clothing/voidsuit/megacorp.dmi b/icons/obj/clothing/voidsuit/megacorp.dmi index a511be9a59dc6d05625a64767138eb6d9c9f93d2..ae7526a5ad629cd8f779f33f8edb76811d547e6a 100644 GIT binary patch delta 267 zcmV+m0rdWxGmwo2XR9JLGWpiV4X>fFDZ*Bkpc$}4#&kDjY493svQExHccZsOZpEm8!x##>T;$@e8Ko$$?WUsim3C|Qrjs#fzgFJ^O=-Bsu0%12%yXpFp* zVK{9mDbi^W^am4Z>b$Yy4=W_+_G-j`yZ^2j5}5E^wS9jRPxXvE_}K>Hwg3PZp-DtR RRCt{2T@7Q}IwoTgR9JLGWpiV4X>fFDZ*Bkpc$}4#O$x#=5QW#tDS~cA{OQ(> zSfmTRLK*F7f^7;(RJ^^>v{cYG<1Q1vm-l7{G8XG}o9)GBm+>1Kt7^^vBTww3Ubw%WA|~p^WvnbIwi%Dh%geY=17X!;?Xr`fP5m(I=0f zD$o?t;0-ls*US2W6j;LJbv;QsVPW80lPp4*XnSpvC>WfhSg@rop>-eRhi5^x>VlDH z(htWY5eJoDH8`p03w^iSh{#