diff --git a/code/modules/cargo/packs/emergency.dm b/code/modules/cargo/packs/emergency.dm index 0676e74e..0f888b4d 100644 --- a/code/modules/cargo/packs/emergency.dm +++ b/code/modules/cargo/packs/emergency.dm @@ -59,6 +59,21 @@ crate_name = "radiation protection crate" crate_type = /obj/structure/closet/crate/radiation +/datum/supply_pack/emergency/radiatione_emergency_bikini + name = "Emergenc Beach Radiation Protection Crate" + desc = "Survive(?) the Nuclear Summer and Supermatter Engine alike with two sets of Radkinis. Each set contains a mask, bikini, and Geiger counter. We'll even throw in a few pill bottles that are able to handles radiation and the affects of the poisoning." + cost = 2000 + contains = list(/obj/item/clothing/mask/gas/radmask, + /obj/item/clothing/mask/gas/radmask, + /obj/item/clothing/under/radkini, + /obj/item/clothing/under/radkini, + /obj/item/geiger_counter, + /obj/item/geiger_counter, + /obj/item/storage/pill_bottle/mutarad, + /obj/item/storage/firstaid/radbgone) + crate_name = "beach radiation protection crate" + crate_type = /obj/structure/closet/crate/radiation + /datum/supply_pack/emergency/rcds name = "Emergency RCDs" desc = "Bombs going off on station? SME blown and now you need to fix the hole it left behind? Well this crate has a pare of Rcds to be able to easily fix up any problem you may have!" diff --git a/code/modules/clothing/masks/gasmask.dm b/code/modules/clothing/masks/gasmask.dm index 6ac07940..107350fc 100644 --- a/code/modules/clothing/masks/gasmask.dm +++ b/code/modules/clothing/masks/gasmask.dm @@ -216,3 +216,14 @@ A.UpdateButtonIcon() to_chat(M, "The Tiki Mask has now changed into the [choice] Mask!") return 1 + +//lewd(?) masks + +/obj/item/clothing/mask/gas/radmask + name = "radiation mask" + desc = "An mask that somewhat protects the user from ratiation. Not as effective like a radiation hood, but is better than nothing." + icon_state = "radmask" + item_state = "radmask" + armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 30, "fire" = 10, "acid" = 10) + + diff --git a/code/modules/clothing/under/jobs/engineering.dm b/code/modules/clothing/under/jobs/engineering.dm index 7dde0367..6f9fe993 100644 --- a/code/modules/clothing/under/jobs/engineering.dm +++ b/code/modules/clothing/under/jobs/engineering.dm @@ -80,4 +80,15 @@ item_color = "robotics_skirt" body_parts_covered = CHEST|GROIN|ARMS can_adjust = FALSE - fitted = FEMALE_UNIFORM_TOP + fitted = FEMALE_UNIFORM_TOP + +/obj/item/clothing/under/radkini + name = "radkini" + desc = "A bikini that protects against radiation. It's surprisingly effective thanks to bluespace fabric, however is still recommended to wear it with a radiation suit." + icon_state = "radkini" + item_state = "radkini" + item_color = "radkini" + can_adjust = FALSE + body_parts_covered = CHEST|GROIN + armor = list("melee" = 0, "bullet" = 0, "laser" = 0,"energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 50, "fire" = 10, "acid" = 10) + fitted = FEMALE_UNIFORM_TOP diff --git a/code/modules/vending/engineering.dm b/code/modules/vending/engineering.dm index d36f4a48..dd51ba62 100644 --- a/code/modules/vending/engineering.dm +++ b/code/modules/vending/engineering.dm @@ -26,6 +26,8 @@ /obj/item/stock_parts/scanning_module = 5, /obj/item/stock_parts/micro_laser = 5, /obj/item/stock_parts/matter_bin = 5, - /obj/item/stock_parts/manipulator = 5) + /obj/item/stock_parts/manipulator = 5, + /obj/item/clothing/under/radkini = 2, + /obj/item/clothing/mask/gas/radmask = 2) armor = list("melee" = 100, "bullet" = 100, "laser" = 100, "energy" = 100, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 50) resistance_flags = FIRE_PROOF diff --git a/code/modules/vending/wardrobes.dm b/code/modules/vending/wardrobes.dm index 125aa5b2..96d9ec1d 100644 --- a/code/modules/vending/wardrobes.dm +++ b/code/modules/vending/wardrobes.dm @@ -86,7 +86,9 @@ /obj/item/clothing/suit/hazardvest = 5, /obj/item/clothing/shoes/workboots = 5, /obj/item/clothing/head/hardhat = 5, - /obj/item/clothing/head/hardhat/weldhat = 3) + /obj/item/clothing/head/hardhat/weldhat = 3, + /obj/item/clothing/under/radkini = 2, + /obj/item/clothing/mask/gas/radmask = 2) refill_canister = /obj/item/vending_refill/wardrobe/engi_wardrobe /obj/item/vending_refill/wardrobe/engi_wardrobe diff --git a/icons/mob/mask.dmi b/icons/mob/mask.dmi index 0b07349a..0ea51ae5 100644 Binary files a/icons/mob/mask.dmi and b/icons/mob/mask.dmi differ diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi index ff6fa0e2..a00f4f9f 100644 Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ diff --git a/icons/obj/clothing/masks.dmi b/icons/obj/clothing/masks.dmi index 178fed62..dd7c9792 100644 Binary files a/icons/obj/clothing/masks.dmi and b/icons/obj/clothing/masks.dmi differ diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi index 95eea9dd..f9aa2b8a 100644 Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ diff --git a/modular_citadel/icons/mob/muzzled_mask.dmi b/modular_citadel/icons/mob/muzzled_mask.dmi index cb12318f..d96e32f8 100644 Binary files a/modular_citadel/icons/mob/muzzled_mask.dmi and b/modular_citadel/icons/mob/muzzled_mask.dmi differ diff --git a/modular_citadel/icons/mob/uniform_digi.dmi b/modular_citadel/icons/mob/uniform_digi.dmi index 0ddbc821..a2f3e880 100644 Binary files a/modular_citadel/icons/mob/uniform_digi.dmi and b/modular_citadel/icons/mob/uniform_digi.dmi differ