diff --git a/code/modules/client/preference_setup/loadout/loadout_head.dm b/code/modules/client/preference_setup/loadout/loadout_head.dm index 36e638b6372..0d143facf00 100644 --- a/code/modules/client/preference_setup/loadout/loadout_head.dm +++ b/code/modules/client/preference_setup/loadout/loadout_head.dm @@ -199,3 +199,9 @@ /datum/gear/head/loose_beanie/New() ..() gear_tweaks = list(gear_tweak_free_color_choice) + + +/datum/gear/head/iacberet + display_name = "IAC Beret" + path = /obj/item/clothing/head/soft/iacberet + allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Chemist", "Paramedic", "Medical Resident") diff --git a/code/modules/client/preference_setup/loadout/loadout_suit.dm b/code/modules/client/preference_setup/loadout/loadout_suit.dm index 92a8c7e3556..3e77a42d5c2 100644 --- a/code/modules/client/preference_setup/loadout/loadout_suit.dm +++ b/code/modules/client/preference_setup/loadout/loadout_suit.dm @@ -77,6 +77,11 @@ cost = 1 allowed_roles = list("Scientist", "Chief Medical Officer", "Medical Doctor", "Chemist", "Geneticist", "Paramedic", "Medical Resident", "Xenobiologist", "Roboticist", "Research Director", "Forensic Technician") +/datum/gear/suit/iacvest + display_name = "IAC vest" + path = /obj/item/clothing/suit/iacvest + allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Chemist", "Paramedic", "Medical Resident") + /datum/gear/suit/poncho display_name = "poncho selection" path = /obj/item/clothing/accessory/poncho diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform.dm b/code/modules/client/preference_setup/loadout/loadout_uniform.dm index 75b97c1706c..2f49c18d441 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uniform.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uniform.dm @@ -9,6 +9,11 @@ display_name = "kilt" path = /obj/item/clothing/under/kilt +/datum/gear/uniform/iacjumpsuit + display_name = "IAC Jumpsuit" + path = /obj/item/clothing/under/rank/iacjumpsuit + allowed_roles = list("Chief Medical Officer", "Medical Doctor", "Chemist", "Paramedic", "Medical Resident") + /datum/gear/uniform/jumpsuit display_name = "generic jumpsuits" path = /obj/item/clothing/under/color/grey diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm index 84cbef1533f..76c13a605f9 100644 --- a/code/modules/clothing/head/helmet.dm +++ b/code/modules/clothing/head/helmet.dm @@ -176,6 +176,13 @@ cold_protection = HEAD min_cold_protection_temperature = SPACE_HELMET_MIN_COLD_PROTECTION_TEMPERATURE +/obj/item/clothing/head/helmet/iachelmet + name = "IAC helmet" + desc = "This helmet is meant to protect the wearer from light debris, scrapes and bumps in a disaster situation, this lightweight helmet doesn't offer any significant protection from attacks or severe accidents. It's not recommended for use as armor and it's definitely not spaceworthy." + icon_state = "iac_helmet" + armor = list(melee = 6, bullet = 10, laser = 10, energy = 3, bomb = 5, bio = 15, rad = 0) + flags_inv = HIDEEARS + /obj/item/clothing/head/helmet/unathi name = "unathi helmet" desc = "A helmet designated to be worn by an unathi, used commonly by the hegemony levies." diff --git a/code/modules/clothing/head/soft_caps.dm b/code/modules/clothing/head/soft_caps.dm index 9821d0eb1c9..6b3ee3cf867 100644 --- a/code/modules/clothing/head/soft_caps.dm +++ b/code/modules/clothing/head/soft_caps.dm @@ -78,3 +78,9 @@ name = "corporate security cap" desc = "It's field cap in corporate colors." icon_state = "corpsoft" + + +/obj/item/clothing/head/soft/iacberet + name = "IAC soft cap" + desc = "It's field cap in IAC colors." + icon_state = "iachat" \ No newline at end of file diff --git a/code/modules/clothing/masks/boxing.dm b/code/modules/clothing/masks/boxing.dm index 18c6f5c6625..72efeae1da8 100644 --- a/code/modules/clothing/masks/boxing.dm +++ b/code/modules/clothing/masks/boxing.dm @@ -30,6 +30,13 @@ desc = "Designed to both hide identities and keep your face comfy and warm." icon_state = "swatclava" +/obj/item/clothing/mask/balaclava/iacmask + name = "IAC balaclava" + desc = "Designed to keep the user warm and sterile in hostile enviroments." + icon_state = "iacmask" + germ_level = 0 + armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 60, rad = 0) + /obj/item/clothing/mask/luchador name = "luchador mask" desc = "Worn by robust fighters, flying high to defeat their foes!" diff --git a/code/modules/clothing/suits/labcoat.dm b/code/modules/clothing/suits/labcoat.dm index ccbed75e15e..f2959e77fc3 100644 --- a/code/modules/clothing/suits/labcoat.dm +++ b/code/modules/clothing/suits/labcoat.dm @@ -101,3 +101,11 @@ icon_state = "labcoat_tox_open" icon_open = "labcoat_tox_open" icon_closed = "labcoat_tox" + +/obj/item/clothing/suit/iacvest + desc = "It's a lightweight vest. Made of a dark, navy mesh with highly-reflective white material, designed to be worn by the Interstellar Aid Corps as a high-visibility vest, over any other clothing. The I.A.C. logo is prominently displayed on the back of the vest, between the shoulders." + name = "IAC vest" + icon_state = "iac_vest_s" + item_state = "iac_vest" + permeability_coefficient = 0.50 + armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 5, rad = 0) \ No newline at end of file diff --git a/code/modules/clothing/under/jobs/medsci.dm b/code/modules/clothing/under/jobs/medsci.dm index 3ceab6cee03..802de5bcf00 100644 --- a/code/modules/clothing/under/jobs/medsci.dm +++ b/code/modules/clothing/under/jobs/medsci.dm @@ -75,6 +75,17 @@ permeability_coefficient = 0.50 armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 10, rad = 0) +/obj/item/clothing/under/rank/iacjumpsuit + desc = "It's a and white jumpsuit, the IAC logo plastered across the back." + name = "IAC uniform" + icon_state = "iacuniform" + item_state = "iacuniform" + permeability_coefficient = 0.50 + armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 15, rad = 5) + body_parts_covered = UPPER_TORSO|LOWER_TORSO + + + /obj/item/clothing/under/rank/nursesuit desc = "It's a jumpsuit commonly worn by nursing staff in the medical department." name = "nurse's suit" diff --git a/html/changelogs/dragoiac.yml b/html/changelogs/dragoiac.yml new file mode 100644 index 00000000000..fb925dc33f0 --- /dev/null +++ b/html/changelogs/dragoiac.yml @@ -0,0 +1,38 @@ +################################ +# 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 +################################# + +# Your name. +author: Drago + +# 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: "Added a variety of IAC related sprites and made into items." + - rscdel: "Adds IAC to loadout with medical restrictions." diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index becc5c5dc00..ea07e085165 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/mob/mask.dmi b/icons/mob/mask.dmi index 417085a90de..8575387a196 100644 Binary files a/icons/mob/mask.dmi and b/icons/mob/mask.dmi differ diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index 08fc78dbf5b..61af28af4ae 100644 Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ diff --git a/icons/mob/uniform.dmi b/icons/mob/uniform.dmi index 5191321b757..6a3f70bbce7 100644 Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index 6c27ba9d0d0..645a7f2b45f 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/masks.dmi b/icons/obj/clothing/masks.dmi index 4fe0e0171ca..faf8251ba91 100644 Binary files a/icons/obj/clothing/masks.dmi and b/icons/obj/clothing/masks.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index 60a59186903..7fcadd6082a 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ diff --git a/icons/obj/clothing/uniforms.dmi b/icons/obj/clothing/uniforms.dmi index 75d4f892905..94a607e70f2 100644 Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ