diff --git a/code/game/machinery/suit_cycler.dm b/code/game/machinery/suit_cycler.dm index bcc1dfa753d..5a1bd3e3354 100644 --- a/code/game/machinery/suit_cycler.dm +++ b/code/game/machinery/suit_cycler.dm @@ -21,7 +21,7 @@ //Departments that the cycler can paint suits to look like. var/list/departments = list("Engineering", "Mining", "Medical", "Security", "Atmos") //Species that the suits can be configured to fit. - var/list/species = list(BODYTYPE_HUMAN, BODYTYPE_SKRELL, BODYTYPE_UNATHI, BODYTYPE_TAJARA, BODYTYPE_VAURCA, BODYTYPE_IPC) + var/list/species = list(BODYTYPE_HUMAN, BODYTYPE_SKRELL, BODYTYPE_UNATHI, BODYTYPE_TAJARA, BODYTYPE_IPC) var/target_department var/target_species @@ -82,6 +82,7 @@ model_text = "Engineering" req_access = list(access_construction) departments = list("Engineering", "Atmos") + species = list(BODYTYPE_HUMAN, BODYTYPE_SKRELL, BODYTYPE_UNATHI, BODYTYPE_TAJARA, BODYTYPE_VAURCA, BODYTYPE_IPC) /obj/machinery/suit_cycler/mining name = "mining suit cycler" diff --git a/code/modules/clothing/spacesuits/void/station.dm b/code/modules/clothing/spacesuits/void/station.dm index f7fef200402..58504a11578 100644 --- a/code/modules/clothing/spacesuits/void/station.dm +++ b/code/modules/clothing/spacesuits/void/station.dm @@ -9,6 +9,7 @@ slot_r_hand_str = "eng_helm" ) armor = list(melee = 40, bullet = 5, laser = 20,energy = 5, bomb = 35, bio = 100, rad = 80) + light_overlay = "helmet_light_dual_low" brightness_on = 6 /obj/item/clothing/suit/space/void/engineering @@ -34,7 +35,7 @@ slot_r_hand_str = "mining_helm" ) armor = list(melee = 50, bullet = 5, laser = 20,energy = 5, bomb = 55, bio = 100, rad = 20) - light_overlay = "helmet_light_dual" + light_overlay = "merc_voidsuit_lights" brightness_on = 6 /obj/item/clothing/suit/space/void/mining @@ -59,6 +60,8 @@ slot_r_hand_str = "medical_helm" ) armor = list(melee = 30, bullet = 5, laser = 20,energy = 5, bomb = 25, bio = 100, rad = 50) + light_overlay = "helmet_light_dual_low" + brightness_on = 6 /obj/item/clothing/suit/space/void/medical icon_state = "rig-medical" @@ -82,7 +85,8 @@ slot_r_hand_str = "sec_helm" ) armor = list(melee = 60, bullet = 10, laser = 30, energy = 5, bomb = 45, bio = 100, rad = 10) - light_overlay = "helmet_light_dual" + light_overlay = "helmet_light_dual_low" + brightness_on = 6 /obj/item/clothing/suit/space/void/security icon_state = "rig-sec" @@ -107,7 +111,8 @@ ) armor = list(melee = 40, bullet = 5, laser = 20,energy = 5, bomb = 35, bio = 100, rad = 50) max_heat_protection_temperature = FIRE_HELMET_MAX_HEAT_PROTECTION_TEMPERATURE + 10000 // It is a suit designed for fire, enclosed - light_overlay = "helmet_light_dual" + light_overlay = "helmet_light_dual_low" + brightness_on = 6 /obj/item/clothing/suit/space/void/atmos desc = "A special suit that protects against hazardous, low pressure environments. Has improved thermal protection and minor radiation shielding." diff --git a/html/changelogs/kyres1-#9850.yml b/html/changelogs/kyres1-#9850.yml new file mode 100644 index 00000000000..441faca37e6 --- /dev/null +++ b/html/changelogs/kyres1-#9850.yml @@ -0,0 +1,43 @@ +################################ +# 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: kyres1 + +# 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: + - tweak: "Resprited all stationside departmental voidsuits." + - tweak: "Resprited the ninja RIG." + - bugfix: "Fixed syndicate suit in-hand sprites." diff --git a/icons/mob/feet.dmi b/icons/mob/feet.dmi index 36cce1e8c26..40190ca0e63 100644 Binary files a/icons/mob/feet.dmi and b/icons/mob/feet.dmi differ diff --git a/icons/mob/hands.dmi b/icons/mob/hands.dmi index 478d45af138..d598de62a84 100644 Binary files a/icons/mob/hands.dmi and b/icons/mob/hands.dmi differ diff --git a/icons/mob/head.dmi b/icons/mob/head.dmi index dc2500682c6..ed56900d573 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/mob/items_lefthand.dmi b/icons/mob/items_lefthand.dmi index be6a47545be..69e5f1f5ffe 100644 Binary files a/icons/mob/items_lefthand.dmi and b/icons/mob/items_lefthand.dmi differ diff --git a/icons/mob/items_righthand.dmi b/icons/mob/items_righthand.dmi index ac5eef5fa89..d2194c1a1ee 100644 Binary files a/icons/mob/items_righthand.dmi and b/icons/mob/items_righthand.dmi differ diff --git a/icons/mob/light_overlays.dmi b/icons/mob/light_overlays.dmi index 945edf249ee..ec829478ae0 100644 Binary files a/icons/mob/light_overlays.dmi and b/icons/mob/light_overlays.dmi differ diff --git a/icons/mob/rig_back.dmi b/icons/mob/rig_back.dmi index 3c8406ea1ef..6c47932430b 100644 Binary files a/icons/mob/rig_back.dmi and b/icons/mob/rig_back.dmi differ diff --git a/icons/mob/species/machine/gloves.dmi b/icons/mob/species/machine/gloves.dmi index a8d82184459..ea46f99bdfb 100644 Binary files a/icons/mob/species/machine/gloves.dmi and b/icons/mob/species/machine/gloves.dmi differ diff --git a/icons/mob/species/machine/helmet.dmi b/icons/mob/species/machine/helmet.dmi index ab0f4df3408..004b978fb9e 100644 Binary files a/icons/mob/species/machine/helmet.dmi and b/icons/mob/species/machine/helmet.dmi differ diff --git a/icons/mob/species/machine/shoes.dmi b/icons/mob/species/machine/shoes.dmi index 37d106e2d94..1ae52cb24c3 100644 Binary files a/icons/mob/species/machine/shoes.dmi and b/icons/mob/species/machine/shoes.dmi differ diff --git a/icons/mob/species/machine/suit.dmi b/icons/mob/species/machine/suit.dmi index bc914bf579d..c907674a949 100644 Binary files a/icons/mob/species/machine/suit.dmi and b/icons/mob/species/machine/suit.dmi differ diff --git a/icons/mob/species/skrell/helmet.dmi b/icons/mob/species/skrell/helmet.dmi index a47b8492c4a..06fc43a07f4 100644 Binary files a/icons/mob/species/skrell/helmet.dmi and b/icons/mob/species/skrell/helmet.dmi differ diff --git a/icons/mob/species/skrell/suit.dmi b/icons/mob/species/skrell/suit.dmi index 0461d59b3ad..4075a0a7a27 100644 Binary files a/icons/mob/species/skrell/suit.dmi and b/icons/mob/species/skrell/suit.dmi differ diff --git a/icons/mob/species/tajaran/gloves.dmi b/icons/mob/species/tajaran/gloves.dmi index 13e6b087955..71fb0b9d43a 100644 Binary files a/icons/mob/species/tajaran/gloves.dmi and b/icons/mob/species/tajaran/gloves.dmi differ diff --git a/icons/mob/species/tajaran/helmet.dmi b/icons/mob/species/tajaran/helmet.dmi index 69a539c7ace..704f015fbd3 100644 Binary files a/icons/mob/species/tajaran/helmet.dmi and b/icons/mob/species/tajaran/helmet.dmi differ diff --git a/icons/mob/species/tajaran/shoes.dmi b/icons/mob/species/tajaran/shoes.dmi index c1c2baffa97..3db5a1fdec9 100644 Binary files a/icons/mob/species/tajaran/shoes.dmi and b/icons/mob/species/tajaran/shoes.dmi differ diff --git a/icons/mob/species/tajaran/suit.dmi b/icons/mob/species/tajaran/suit.dmi index 96a3d6ab793..d01646d819d 100644 Binary files a/icons/mob/species/tajaran/suit.dmi and b/icons/mob/species/tajaran/suit.dmi differ diff --git a/icons/mob/species/unathi/gloves.dmi b/icons/mob/species/unathi/gloves.dmi index a072b7fc0c9..7d2b10d7ca3 100644 Binary files a/icons/mob/species/unathi/gloves.dmi and b/icons/mob/species/unathi/gloves.dmi differ diff --git a/icons/mob/species/unathi/helmet.dmi b/icons/mob/species/unathi/helmet.dmi index 70500f18c1f..b326a601754 100644 Binary files a/icons/mob/species/unathi/helmet.dmi and b/icons/mob/species/unathi/helmet.dmi differ diff --git a/icons/mob/species/unathi/shoes.dmi b/icons/mob/species/unathi/shoes.dmi index 05abc6d0f35..ccd93a8e43f 100644 Binary files a/icons/mob/species/unathi/shoes.dmi and b/icons/mob/species/unathi/shoes.dmi differ diff --git a/icons/mob/species/unathi/suit.dmi b/icons/mob/species/unathi/suit.dmi index 271e234ca61..529f60f529c 100644 Binary files a/icons/mob/species/unathi/suit.dmi and b/icons/mob/species/unathi/suit.dmi differ diff --git a/icons/mob/species/vaurca/gloves.dmi b/icons/mob/species/vaurca/gloves.dmi index ea38298ace8..27beb51d400 100644 Binary files a/icons/mob/species/vaurca/gloves.dmi and b/icons/mob/species/vaurca/gloves.dmi differ diff --git a/icons/mob/species/vaurca/helmet.dmi b/icons/mob/species/vaurca/helmet.dmi index 4bf968950ec..5af078f19b4 100644 Binary files a/icons/mob/species/vaurca/helmet.dmi and b/icons/mob/species/vaurca/helmet.dmi differ diff --git a/icons/mob/species/vaurca/shoes.dmi b/icons/mob/species/vaurca/shoes.dmi index f3bad9531f7..fd5a8c565db 100644 Binary files a/icons/mob/species/vaurca/shoes.dmi and b/icons/mob/species/vaurca/shoes.dmi differ diff --git a/icons/mob/species/vaurca/suit.dmi b/icons/mob/species/vaurca/suit.dmi index a56ffa48987..322be3e7eb6 100644 Binary files a/icons/mob/species/vaurca/suit.dmi and b/icons/mob/species/vaurca/suit.dmi differ diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index 7a1bdca5d64..53458b4cdeb 100644 Binary files a/icons/mob/suit.dmi and b/icons/mob/suit.dmi differ diff --git a/icons/obj/clothing/gloves.dmi b/icons/obj/clothing/gloves.dmi index c072849970e..6b02c5cd7f8 100644 Binary files a/icons/obj/clothing/gloves.dmi and b/icons/obj/clothing/gloves.dmi differ diff --git a/icons/obj/clothing/hats.dmi b/icons/obj/clothing/hats.dmi index 9603b7564f1..9c717f2f9ae 100644 Binary files a/icons/obj/clothing/hats.dmi and b/icons/obj/clothing/hats.dmi differ diff --git a/icons/obj/clothing/shoes.dmi b/icons/obj/clothing/shoes.dmi index cec18f96583..811b56543dd 100644 Binary files a/icons/obj/clothing/shoes.dmi and b/icons/obj/clothing/shoes.dmi differ diff --git a/icons/obj/clothing/species/machine/hats.dmi b/icons/obj/clothing/species/machine/hats.dmi index 585bf31b4a8..71c5c359120 100644 Binary files a/icons/obj/clothing/species/machine/hats.dmi and b/icons/obj/clothing/species/machine/hats.dmi differ diff --git a/icons/obj/clothing/species/machine/suits.dmi b/icons/obj/clothing/species/machine/suits.dmi index dc2f0c15f5c..6663957110d 100644 Binary files a/icons/obj/clothing/species/machine/suits.dmi and b/icons/obj/clothing/species/machine/suits.dmi differ diff --git a/icons/obj/clothing/species/skrell/hats.dmi b/icons/obj/clothing/species/skrell/hats.dmi index 4f2ceaf9802..80742706b31 100644 Binary files a/icons/obj/clothing/species/skrell/hats.dmi and b/icons/obj/clothing/species/skrell/hats.dmi differ diff --git a/icons/obj/clothing/species/skrell/suits.dmi b/icons/obj/clothing/species/skrell/suits.dmi index 56d2b9fe850..4d782e7b294 100644 Binary files a/icons/obj/clothing/species/skrell/suits.dmi and b/icons/obj/clothing/species/skrell/suits.dmi differ diff --git a/icons/obj/clothing/species/tajaran/hats.dmi b/icons/obj/clothing/species/tajaran/hats.dmi index 7318770506d..6f443f84bae 100644 Binary files a/icons/obj/clothing/species/tajaran/hats.dmi and b/icons/obj/clothing/species/tajaran/hats.dmi differ diff --git a/icons/obj/clothing/species/tajaran/suits.dmi b/icons/obj/clothing/species/tajaran/suits.dmi index 92831ac3e4d..a52f41e3f14 100644 Binary files a/icons/obj/clothing/species/tajaran/suits.dmi and b/icons/obj/clothing/species/tajaran/suits.dmi differ diff --git a/icons/obj/clothing/species/unathi/hats.dmi b/icons/obj/clothing/species/unathi/hats.dmi index 3f117ad5f2c..fd46d6a0605 100644 Binary files a/icons/obj/clothing/species/unathi/hats.dmi and b/icons/obj/clothing/species/unathi/hats.dmi differ diff --git a/icons/obj/clothing/species/unathi/suits.dmi b/icons/obj/clothing/species/unathi/suits.dmi index 67b54777b70..e29e38d8f92 100644 Binary files a/icons/obj/clothing/species/unathi/suits.dmi and b/icons/obj/clothing/species/unathi/suits.dmi differ diff --git a/icons/obj/clothing/species/vaurca/hats.dmi b/icons/obj/clothing/species/vaurca/hats.dmi index 532097457f6..e6caf03ccd2 100644 Binary files a/icons/obj/clothing/species/vaurca/hats.dmi and b/icons/obj/clothing/species/vaurca/hats.dmi differ diff --git a/icons/obj/clothing/species/vaurca/suits.dmi b/icons/obj/clothing/species/vaurca/suits.dmi index 9fc823579e2..7c726a4c514 100644 Binary files a/icons/obj/clothing/species/vaurca/suits.dmi and b/icons/obj/clothing/species/vaurca/suits.dmi differ diff --git a/icons/obj/clothing/suits.dmi b/icons/obj/clothing/suits.dmi index 94b7aa4eb06..20b16874c48 100644 Binary files a/icons/obj/clothing/suits.dmi and b/icons/obj/clothing/suits.dmi differ diff --git a/icons/obj/rig_modules.dmi b/icons/obj/rig_modules.dmi index 38bad804687..9a0dd16a29f 100644 Binary files a/icons/obj/rig_modules.dmi and b/icons/obj/rig_modules.dmi differ