diff --git a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm index bf125eb7ddc..4bb2301cc6f 100644 --- a/code/game/objects/structures/crates_lockers/closets/utility_closets.dm +++ b/code/game/objects/structures/crates_lockers/closets/utility_closets.dm @@ -163,12 +163,12 @@ icon_closed = "radsuitcloset" /obj/structure/closet/radiation/fill() - new /obj/item/clothing/suit/radiation(src) - new /obj/item/clothing/head/radiation(src) - new /obj/item/clothing/glasses/safety/goggles(src) - new /obj/item/clothing/suit/radiation(src) - new /obj/item/clothing/head/radiation(src) - new /obj/item/clothing/glasses/safety/goggles(src) + for(var/i = 1 to 2) + new /obj/item/clothing/head/radiation(src) + new /obj/item/clothing/suit/radiation(src) + new /obj/item/clothing/glasses/safety/goggles(src) + for(var/i = 1 to 2) + new /obj/item/reagent_containers/hypospray/autoinjector/hyronalin(src) /* * Bombsuit closet diff --git a/code/modules/clothing/suits/utility.dm b/code/modules/clothing/suits/utility.dm index 4babbc84df5..2c9147ecc72 100644 --- a/code/modules/clothing/suits/utility.dm +++ b/code/modules/clothing/suits/utility.dm @@ -176,13 +176,19 @@ * Radiation protection */ /obj/item/clothing/head/radiation - name = "radiation Hood" - icon_state = "rad" - desc = "A hood with radiation protective properties. Label: Made with lead, do not eat insulation" + name = "radiation hood" + desc = "A hood with radiation protective properties. Label: Made with lead, do not eat insulation." + icon = 'icons/clothing/kit/radsuit.dmi' + item_icons = null + icon_state = "radhood" + item_state = "radhood" + contained_sprite = TRUE + icon_auto_adapt = TRUE + icon_supported_species_tags = list("skr", "una", "taj") flags_inv = BLOCKHAIR body_parts_covered = HEAD|FACE|EYES armor = list( - bio = ARMOR_BIO_RESISTANT, + bio = ARMOR_BIO_RESISTANT, rad = ARMOR_RAD_SHIELDED ) siemens_coefficient = 0.35 @@ -191,13 +197,18 @@ /obj/item/clothing/suit/radiation name = "radiation suit" desc = "A suit that protects against radiation. Label: Made with lead, do not eat insulation." - icon_state = "rad" - item_state = "rad_suit" + icon = 'icons/clothing/kit/radsuit.dmi' + item_icons = null + icon_state = "radsuit" + item_state = "radsuit" + contained_sprite = TRUE + icon_auto_adapt = TRUE + icon_supported_species_tags = list("una") w_class = ITEMSIZE_LARGE//bulky item gas_transfer_coefficient = 0.90 permeability_coefficient = 0.50 body_parts_covered = UPPER_TORSO|LOWER_TORSO|LEGS|ARMS|HANDS|FEET - allowed = list(/obj/item/device/flashlight,/obj/item/tank/emergency_oxygen,/obj/item/clothing/head/radiation,/obj/item/clothing/mask/gas) + allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/storage/bag/inflatable,/obj/item/device/t_scanner,/obj/item/rfd/construction,/obj/item/material/twohanded/fireaxe,/obj/item/storage/backpack/cell,/obj/item/clothing/head/radiation,/obj/item/clothing/mask/gas,/obj/item/reagent_containers/hypospray/autoinjector) slowdown = 1.5 armor = list( bio = ARMOR_BIO_RESISTANT, diff --git a/code/modules/reagents/reagent_containers/hypospray.dm b/code/modules/reagents/reagent_containers/hypospray.dm index 78d1cbee93f..7ff4c11243a 100644 --- a/code/modules/reagents/reagent_containers/hypospray.dm +++ b/code/modules/reagents/reagent_containers/hypospray.dm @@ -205,6 +205,11 @@ flags = 0 reagents_to_add = list(/decl/reagent/coagzolug = 5) +/obj/item/reagent_containers/hypospray/autoinjector/hyronalin + name_label = "hyronalin" + flags = 0 + reagents_to_add = list(/decl/reagent/hyronalin = 5) + /obj/item/reagent_containers/hypospray/autoinjector/sideeffectbgone name_label = "sideeffects-be-gone!" desc = "A special cocktail designed to counter the side-effects of various drugs. Has 2 uses." diff --git a/html/changelogs/geeves-radsuit_tweak.yml b/html/changelogs/geeves-radsuit_tweak.yml new file mode 100644 index 00000000000..ce5c7d9d6ba --- /dev/null +++ b/html/changelogs/geeves-radsuit_tweak.yml @@ -0,0 +1,8 @@ +author: Geeves + +delete-after: True + +changes: + - rscadd: "Radiation suits have been given new sprites." + - rscadd: "Radiation closets now spawn with two anti-rad autoinjectors." + - rscadd: "Radiation suits can now hold a similar array of items to an EVA hardsuit in is storage slot now, as well as the hood and the anti-rad autoinjector." \ No newline at end of file diff --git a/icons/clothing/kit/radsuit.dmi b/icons/clothing/kit/radsuit.dmi new file mode 100644 index 00000000000..d2624a4af8f Binary files /dev/null and b/icons/clothing/kit/radsuit.dmi differ diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index b821e6538f6..f567acf2b45 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/mob/items/clothing/lefthand_suit.dmi b/icons/mob/items/clothing/lefthand_suit.dmi index 785e367de51..b3997d438e9 100644 Binary files a/icons/mob/items/clothing/lefthand_suit.dmi and b/icons/mob/items/clothing/lefthand_suit.dmi differ diff --git a/icons/mob/items/clothing/righthand_suit.dmi b/icons/mob/items/clothing/righthand_suit.dmi index ed837cd00b6..f89b383a682 100644 Binary files a/icons/mob/items/clothing/righthand_suit.dmi and b/icons/mob/items/clothing/righthand_suit.dmi differ diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index 6c6da073165..c227ab8f583 100644 Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index 34ad9b67d3c..2ee61834312 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index cfcfbf0d141..b5328a0653b 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ