diff --git a/code/modules/client/preference_setup/loadout/loadout_uniform.dm b/code/modules/client/preference_setup/loadout/loadout_uniform.dm index 331e3896ee3..0a945b016fe 100644 --- a/code/modules/client/preference_setup/loadout/loadout_uniform.dm +++ b/code/modules/client/preference_setup/loadout/loadout_uniform.dm @@ -186,6 +186,7 @@ uniform["Idris Incorporated security uniform"] = /obj/item/clothing/under/rank/security/idris uniform["Idris Incorporated security uniform, alternative"] = /obj/item/clothing/under/rank/security/idris/alt uniform["Eridani PMC uniform"] = /obj/item/clothing/under/rank/security/eridani + uniform["Eridani PMC uniform, alternative"] = /obj/item/clothing/under/rank/security/eridani/alt gear_tweaks += new/datum/gear_tweak/path(uniform) /datum/gear/uniform/pants @@ -274,5 +275,5 @@ uniform["Necropolis Industries uniform"] = /obj/item/clothing/under/rank/necropolis uniform["Idris Incorporated uniform"] = /obj/item/clothing/under/rank/idris uniform["Einstein Engines uniform"] = /obj/item/clothing/under/rank/einstein_engines - uniform["Zeng-Hu Pharmaceuticals uniform"] = /obj/item/clothing/under/rank/zheng + uniform["Zeng-Hu Pharmaceuticals uniform"] = /obj/item/clothing/under/rank/zeng gear_tweaks += new/datum/gear_tweak/path(uniform) \ No newline at end of file diff --git a/code/modules/client/preference_setup/loadout/loadout_xeno/machine.dm b/code/modules/client/preference_setup/loadout/loadout_xeno/machine.dm index 234d0a766a7..eae3676fe3a 100644 --- a/code/modules/client/preference_setup/loadout/loadout_xeno/machine.dm +++ b/code/modules/client/preference_setup/loadout/loadout_xeno/machine.dm @@ -84,7 +84,7 @@ sort_category = "Xenowear - IPC" /datum/gear/suit/idris - display_name = "Idris reclamation unit coat" + display_name = "Idris Reclamation Unit coat" path = /obj/item/clothing/suit/armor/vest/idris whitelisted = list("Baseline Frame", "Hephaestus G1 Industrial Frame", "Hephaestus G2 Industrial Frame", "Xion Industrial Frame", "Zeng-Hu Mobility Frame", "Bishop Accessory Frame", "Shell Frame") sort_category = "Xenowear - IPC" diff --git a/code/modules/client/preferences_factions.dm b/code/modules/client/preferences_factions.dm index 31b9d8d656e..66a183792f6 100644 --- a/code/modules/client/preferences_factions.dm +++ b/code/modules/client/preferences_factions.dm @@ -47,7 +47,9 @@ var/global/list/faction_choices = list( "Grayson Manufactories Ltd.", "Aether Atmospherics", "Zeng-Hu Pharmaceuticals", - "Hephaestus Industries" + "Hephaestus Industries", + "Idris Incorporated", + "Necropolis Industries" ) var/global/list/religion_choices = list( diff --git a/code/modules/clothing/suits/armor.dm b/code/modules/clothing/suits/armor.dm index 25e83d8838f..6ef1190eb7a 100644 --- a/code/modules/clothing/suits/armor.dm +++ b/code/modules/clothing/suits/armor.dm @@ -531,10 +531,14 @@ armor = list(melee = 50, bullet = 30, laser = 30, energy = 15, bomb = 40, bio = 0, rad = 0) /obj/item/clothing/suit/armor/vest/idris - name = "Idris reclamation unit coat " + name = "Idris Reclamation Unit coat" desc = "A coat worn by the Idris reclamation units, notorious across space." icon_state = "iru_coat" item_state = "iru_coat" + cold_protection = 0 + min_cold_protection_temperature = 0 + heat_protection = 0 + max_heat_protection_temperature = 0 //All of the armor below is mostly unused diff --git a/code/modules/clothing/under/jobs/civilian.dm b/code/modules/clothing/under/jobs/civilian.dm index 26f19b6c86d..fea7e2a501d 100644 --- a/code/modules/clothing/under/jobs/civilian.dm +++ b/code/modules/clothing/under/jobs/civilian.dm @@ -198,8 +198,8 @@ icon_state = "einstein_engine" worn_state = "einstein_engine" -/obj/item/clothing/under/rank/zheng - name = "Zheng-Hu uniform" - desc = "A uniform worn by Zheng-Hu employees and contractors." +/obj/item/clothing/under/rank/zeng + name = "Zeng-Hu uniform" + desc = "A uniform worn by Zeng-Hu employees and contractors." icon_state = "zhu" worn_state = "zhu" \ No newline at end of file diff --git a/code/modules/clothing/under/jobs/security.dm b/code/modules/clothing/under/jobs/security.dm index 02b477b6958..72e9f8bc6b3 100644 --- a/code/modules/clothing/under/jobs/security.dm +++ b/code/modules/clothing/under/jobs/security.dm @@ -86,6 +86,9 @@ icon_state = "erisec" worn_state = "erisec" +/obj/item/clothing/under/rank/security/eridani/alt + icon_state = "erisec_alt" + worn_state = "erisec_alt" /* * Detective diff --git a/html/changelogs/paradoxspace-violatethenap.yml b/html/changelogs/paradoxspace-violatethenap.yml new file mode 100644 index 00000000000..ccc56883b34 --- /dev/null +++ b/html/changelogs/paradoxspace-violatethenap.yml @@ -0,0 +1,44 @@ +################################ +# 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: ParadoxSpace & DasFox + +# 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 the old Eridani uniform from the week-long event. The dark one before this is now the alt uniform." + - rscadd: "Adds Necropolis and Idris to the faction list, for contractors and such." + - rscadd: "Replaces the Idris Alt uniform with a better sprite, made by DasFox." + - tweak: "Idris Reclamation Unit coat is now ventillated, and some sprite issues were fixed by TheLancer." diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index 09f90999a19..4b913dcd0ef 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 f5d609233eb..29b605bf352 100644 Binary files a/icons/mob/uniform.dmi and b/icons/mob/uniform.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index b675ce28a54..397c2dbfe46 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 bec8f31991e..c5f896ec0d5 100644 Binary files a/icons/obj/clothing/uniforms.dmi and b/icons/obj/clothing/uniforms.dmi differ