diff --git a/code/game/objects/items/devices/modkit.dm b/code/game/objects/items/devices/modkit.dm index 557ecef9959..65aa5d13cb3 100644 --- a/code/game/objects/items/devices/modkit.dm +++ b/code/game/objects/items/devices/modkit.dm @@ -257,7 +257,7 @@ qdel(src) return - if(!(W.type in suit_options) && !(W.type in helmet_options)) + if(!(W.type in list_values(suit_options)) && !(W.type in list_values(helmet_options)) && !(W.type in list_values(rig_options))) return var/voidsuit_product @@ -266,7 +266,7 @@ voidsuit_product = suit_options[suit_choice] else if(istype(W, /obj/item/clothing/head/helmet/space/void)) var/helmet_choice = tgui_input_list(user, "Select a helmet modification:", "Voidsuit Modkit", helmet_options) - voidsuit_product = suit_options[helmet_choice] + voidsuit_product = helmet_options[helmet_choice] else if(istype(W, /obj/item/rig)) var/rig_choice = tgui_input_list(user, "Select a hardsuit modification:", "Voidsuit Modkit", rig_options) voidsuit_product = rig_options[rig_choice] @@ -366,6 +366,25 @@ "Nexus Security Hardsuit" = /obj/item/rig/nanotrasen/nexus ) +/obj/item/voidsuit_modkit_multi/coalition + name = "coalition of colonies voidsuit modkit" + suit_options = list( + "Coalition Vulture" = /obj/item/clothing/suit/space/void/coalition, + "Xanan Eagle" = /obj/item/clothing/suit/space/void/coalition/xanu, + "Gadpathurian Vulture-GP" = /obj/item/clothing/suit/space/void/coalition/gadpathur, + "Himean Buzzard" = /obj/item/clothing/suit/space/void/coalition/himeo, + "Galatean Jackdaw" = /obj/item/clothing/suit/space/void/coalition/galatea, + "Assunzionii Rook" = /obj/item/clothing/suit/space/void/coalition/assunzione + ) + helmet_options = list( + "Coalition Vulture" = /obj/item/clothing/head/helmet/space/void/coalition, + "Xanan Eagle" = /obj/item/clothing/head/helmet/space/void/coalition/xanu, + "Gadpathurian Vulture-GP" = /obj/item/clothing/head/helmet/space/void/coalition/gadpathur, + "Himean Buzzard" = /obj/item/clothing/head/helmet/space/void/coalition/himeo, + "Galatean Jackdaw" = /obj/item/clothing/head/helmet/space/void/coalition/galatea, + "Assunzionii Rook" = /obj/item/clothing/head/helmet/space/void/coalition/assunzione + ) + /obj/item/storage/box/unathi_pirate name = "unathi pirate modkit box" desc = "Contains modkits to convert Unathi pirate voidsuits into fleet variants." @@ -381,6 +400,11 @@ desc = "Contains modkits to convert NanoTrasen hardsuits into alternate variants." starts_with = list(/obj/item/voidsuit_modkit_multi/nanotrasen = 4) +/obj/item/storage/box/coalition + name = "coalition of colonies modkit box" + desc = "Contains modkits to convert Coalition voidsuits into member-state variants." + starts_with = list(/obj/item/voidsuit_modkit_multi/coalition = 4) + #undef MODKIT_HELMET #undef MODKIT_SUIT #undef MODKIT_RIG 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 4d4aa2e2c30..422e3e76bea 100644 --- a/code/game/objects/structures/crates_lockers/crates/gear_loadout.dm +++ b/code/game/objects/structures/crates_lockers/crates/gear_loadout.dm @@ -67,6 +67,7 @@ new /obj/item/ammo_magazine/gauss(src) new /obj/item/ammo_magazine/gauss/emp(src) new /obj/item/storage/box/species_modkit(src) + new /obj/item/storage/box/coalition(src) /obj/structure/closet/crate/secure/gear_loadout/coalition_single/fill() new /obj/item/clothing/head/helmet/space/void/coalition(src) @@ -78,6 +79,7 @@ new /obj/item/ammo_magazine/gauss(src) new /obj/item/ammo_magazine/gauss/emp(src) new /obj/item/device/modkit/multi_species(src) + new /obj/item/voidsuit_modkit_multi/coalition(src) /obj/structure/closet/crate/secure/gear_loadout/eridani/fill() new /obj/item/clothing/under/rank/security/pmc/epmc(src) diff --git a/code/modules/clothing/clothing.dm b/code/modules/clothing/clothing.dm index 8c668b7c492..b534e3ca582 100644 --- a/code/modules/clothing/clothing.dm +++ b/code/modules/clothing/clothing.dm @@ -38,6 +38,9 @@ /// Measured in Celsius, when worn, the clothing modifies the baseline temperature by this much var/body_temperature_change = 0 + ///How protective is this clothing against anomalies? Should be a value from 0 to 1 indicating the percentage of anomaly protection it provides. + var/anomaly_protection = 0 + /obj/item/clothing/Initialize(var/mapload, var/material_key) . = ..(mapload) if(!material_key) diff --git a/code/modules/clothing/glasses/glasses.dm b/code/modules/clothing/glasses/glasses.dm index b663c79581e..82a696c2624 100644 --- a/code/modules/clothing/glasses/glasses.dm +++ b/code/modules/clothing/glasses/glasses.dm @@ -224,6 +224,7 @@ BLIND // can't see anything toggleable = 1 unacidable = 1 item_flags = ITEM_FLAG_AIRTIGHT + anomaly_protection = 0.1 /obj/item/clothing/glasses/science/Initialize() . = ..() diff --git a/code/modules/clothing/gloves/miscellaneous.dm b/code/modules/clothing/gloves/miscellaneous.dm index 64e80ebdc38..a120dd56646 100644 --- a/code/modules/clothing/gloves/miscellaneous.dm +++ b/code/modules/clothing/gloves/miscellaneous.dm @@ -85,6 +85,7 @@ icon_state = "nitrile" item_state = "nitrile" balloon = /obj/item/toy/balloon/latex/nitrile + anomaly_protection = 0.1 /obj/item/clothing/gloves/latex/nitrile/unathi name = "unathi nitrile gloves" diff --git a/code/modules/clothing/spacesuits/rig/rig.dm b/code/modules/clothing/spacesuits/rig/rig.dm index 17c44909752..40419e92da4 100644 --- a/code/modules/clothing/spacesuits/rig/rig.dm +++ b/code/modules/clothing/spacesuits/rig/rig.dm @@ -101,6 +101,7 @@ var/allowed_module_types = MODULE_GENERAL // All rigs by default should have access to general var/list/species_restricted = list(BODYTYPE_HUMAN,BODYTYPE_TAJARA,BODYTYPE_UNATHI, BODYTYPE_SKRELL, BODYTYPE_IPC, BODYTYPE_IPC_BISHOP, BODYTYPE_IPC_ZENGHU) + var/anomaly_protection = FALSE //If TRUE, this rig will protect against anomalies. Currently only used for AMI hardsuit. /obj/item/rig/get_examine_text(mob/user, distance, is_adjacent, infix, suffix) . = ..() diff --git a/code/modules/clothing/spacesuits/rig/suits/station.dm b/code/modules/clothing/spacesuits/rig/suits/station.dm index 265f3034032..d787f9c2115 100644 --- a/code/modules/clothing/spacesuits/rig/suits/station.dm +++ b/code/modules/clothing/spacesuits/rig/suits/station.dm @@ -288,6 +288,7 @@ req_one_access = list() allowed_module_types = MODULE_GENERAL | MODULE_UTILITY + anomaly_protection = TRUE /obj/item/rig/hazmat/equipped diff --git a/code/modules/clothing/spacesuits/void/misc.dm b/code/modules/clothing/spacesuits/void/misc.dm index e3ad1bf70f1..0f45257eb6b 100644 --- a/code/modules/clothing/spacesuits/void/misc.dm +++ b/code/modules/clothing/spacesuits/void/misc.dm @@ -66,7 +66,6 @@ brightness_on = 6 - refittable = FALSE /obj/item/clothing/suit/space/void/coalition name = "coalition vulture voidsuit" @@ -1090,3 +1089,44 @@ refittable_species = list(BODYTYPE_HUMAN, BODYTYPE_IPC, BODYTYPE_TAJARA, BODYTYPE_UNATHI, BODYTYPE_SKRELL, BODYTYPE_VAURCA) brightness_on = 6 siemens_coefficient = 0.35 + +/obj/item/clothing/head/helmet/space/void/coalition/assunzione + name = "\improper Assunzionii rook voidsuit helmet" + desc = "Based on the common Coalition Vulture design, the ZH-A45 'Rook' has rapidly become commonplace equipment among the Republic of Assunzione's scientific and military forces. In addition to being a servicable combat voidsuit model, it is equipped with state-of-the-art anomalous energy shielding developed by Zeng-Hu Pharmaceuticals." + desc_extended = "Rook suits are largely seen in the hands of Assunzionii military patrols in Light's Edge, as well as scientific expeditions into the darkness of the Lemurian Sea. The current model was developed in 2412 as a joint effort between Assunzionii government R&D and Zeng-Hu Parmaceuticals." + icon_state = "assunzione_helmet" + item_state = "assunzione_helmet" + species_restricted = list(BODYTYPE_HUMAN, BODYTYPE_IPC_INDUSTRIAL, BODYTYPE_IPC_ZENGHU, BODYTYPE_IPC_BISHOP) + refittable_species = list(BODYTYPE_HUMAN, BODYTYPE_IPC) + icon_supported_species_tags = list("ipc") + anomaly_protection = 0.2 + armor = list( + melee = ARMOR_MELEE_RESISTANT, + bullet = ARMOR_BALLISTIC_MEDIUM, + laser = ARMOR_LASER_PISTOL, + energy = ARMOR_ENERGY_MINOR, + bomb = ARMOR_BOMB_PADDED, + bio = ARMOR_BIO_SHIELDED, + rad = ARMOR_RAD_SHIELDED + ) + +/obj/item/clothing/suit/space/void/coalition/assunzione + name = "\improper Assunzionii rook voidsuit" + desc = "Based on the common Coalition Vulture design, the ZH-A45 'Rook' has rapidly become commonplace equipment among the Republic of Assunzione's scientific and military forces. In addition to being a servicable combat voidsuit model, it is equipped with state-of-the-art anomalous energy shielding developed by Zeng-Hu Pharmaceuticals." + desc_extended = "Rook suits are largely seen in the hands of Assunzionii military patrols in Light's Edge, as well as scientific expeditions into the darkness of the Lemurian Sea. The current model was developed in 2412 as a joint effort between Assunzionii government R&D and Zeng-Hu Parmaceuticals." + icon_state = "assunzione_suit" + item_state = "assunzione_suit" + icon_supported_species_tags = list("ipc") + anomaly_protection = 0.5 + armor = list( + melee = ARMOR_MELEE_RESISTANT, + bullet = ARMOR_BALLISTIC_MEDIUM, + laser = ARMOR_LASER_PISTOL, + energy = ARMOR_ENERGY_MINOR, + bomb = ARMOR_BOMB_PADDED, + bio = ARMOR_BIO_SHIELDED, + rad = ARMOR_RAD_SHIELDED + ) + + species_restricted = list(BODYTYPE_HUMAN, BODYTYPE_IPC_INDUSTRIAL, BODYTYPE_IPC_ZENGHU, BODYTYPE_IPC_BISHOP, BODYTYPE_IPC, BODYTYPE_SKRELL) + refittable_species = list(BODYTYPE_HUMAN, BODYTYPE_IPC) diff --git a/code/modules/research/xenoarchaeology/artifact/effect.dm b/code/modules/research/xenoarchaeology/artifact/effect.dm index cb064636c55..8fcf0b3709c 100644 --- a/code/modules/research/xenoarchaeology/artifact/effect.dm +++ b/code/modules/research/xenoarchaeology/artifact/effect.dm @@ -93,34 +93,23 @@ return 1 //anomaly suits give best protection, but excavation suits are almost as good - if(istype(H.back,/obj/item/rig/hazmat)) - var/obj/item/rig/hazmat/rig = H.back - if(rig.suit_is_deployed() && !rig.offline) + if(istype(H.back,/obj/item/rig)) + var/obj/item/rig/rig = H.back + if(rig.suit_is_deployed() && !rig.offline && rig.anomaly_protection) return 0 //<- Maximum level of protection achieved. + var/list/clothing = list(H.w_uniform, H.wear_suit, H.head, H.glasses, H.gloves) var/protected = 0 - if(istype(H.wear_suit,/obj/item/clothing/suit/hazmat/anomaly)) - protected += 0.6 - else if(istype(H.wear_suit,/obj/item/clothing/suit/space/anomaly)) - protected += 0.5 + for(var/obj/item/clothing/C in clothing) + protected += C.anomaly_protection - if(istype(H.head,/obj/item/clothing/head/hazmat/anomaly)) - protected += 0.3 - else if(istype(H.head,/obj/item/clothing/head/helmet/space/anomaly)) - protected += 0.2 - - //latex gloves and science goggles also give a bit of bonus protection - if(istype(H.gloves,/obj/item/clothing/gloves/latex/nitrile)) - protected += 0.1 /* If you have Anomaly Suit, Anomaly Hood, Latex Gloves AND Science Goggles, you will have 0.6 + 0.3 + 0.1 + 0.1 = 1.1 maximum protection level. The CLAMP01 instruction make sure that "protected" will be always in 0..1 range boundaries. */ - if(istype(H.glasses,/obj/item/clothing/glasses/science)) - protected += 0.1 //<- In case of full not-Anomaly clothing, you'll have 0.5 + 0.2 + 0.1 + 0.1 = 0.9 maximum protection level. //As said before, in case of a value of 1.1, "protected" will be setted to 1. protected = CLAMP01(protected) diff --git a/code/modules/research/xenoarchaeology/tools/anomaly_suit.dm b/code/modules/research/xenoarchaeology/tools/anomaly_suit.dm index b4fd7cc891b..407b9181c3e 100644 --- a/code/modules/research/xenoarchaeology/tools/anomaly_suit.dm +++ b/code/modules/research/xenoarchaeology/tools/anomaly_suit.dm @@ -8,6 +8,7 @@ icon_auto_adapt = TRUE icon_supported_species_tags = list("skr", "taj", "una") armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 100) + anomaly_protection = 0.6 /obj/item/clothing/head/hazmat/anomaly name = "anomaly hood" @@ -17,6 +18,7 @@ icon_auto_adapt = TRUE icon_supported_species_tags = list("skr", "taj", "una") armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 100) + anomaly_protection = 0.3 /obj/item/clothing/suit/space/anomaly name = "excavation suit" @@ -27,6 +29,7 @@ allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit) contained_sprite = FALSE icon = 'icons/obj/clothing/suits.dmi' + anomaly_protection = 0.5 /obj/item/clothing/head/helmet/space/anomaly name = "excavation hood" @@ -36,3 +39,4 @@ armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 100, rad = 100) icon = 'icons/obj/clothing/hats.dmi' contained_sprite = FALSE + anomaly_protection = 0.2 diff --git a/html/changelogs/RustingWithYou - ass.yml b/html/changelogs/RustingWithYou - ass.yml new file mode 100644 index 00000000000..3bfbddb0f24 --- /dev/null +++ b/html/changelogs/RustingWithYou - ass.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 an Assunzione voidsuit and a COC voidsuit modkit." + - bugfix: "Fixes non-functional voidsuit modkits." diff --git a/icons/obj/clothing/voidsuit/coalition.dmi b/icons/obj/clothing/voidsuit/coalition.dmi index 0826e367fe7..df0745e9544 100644 Binary files a/icons/obj/clothing/voidsuit/coalition.dmi and b/icons/obj/clothing/voidsuit/coalition.dmi differ