diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index 6265ff27e7f..fe14e623c65 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -712,6 +712,14 @@ species = list("Human","Tajara","Skrell","Unathi", "Machine") can_repair = 1 +/obj/machinery/suit_cycler/science + name = "Research suit cycler" + model_text = "Research" + req_access = list(access_research) + departments = list("Research") + species = list("Human","Tajara","Skrell","Unathi", "Machine") + can_repair = 1 + /obj/machinery/suit_cycler/attack_ai(mob/user as mob) return src.attack_hand(user) @@ -1118,6 +1126,15 @@ suit.name = "blood-red voidsuit" suit.item_state = "syndie_voidsuit" suit.icon_state = "rig-syndie" + if("Research") + if(helmet) + helmet.name = "research voidsuit helmet" + helmet.icon_state = "rig0-sci" + helmet.item_state = "research_voidsuit_helmet" + if(suit) + suit.name = "research voidsuit" + suit.item_state = "research_voidsuit" + suit.icon_state = "rig-sci" if(helmet) helmet.name = "refitted [helmet.name]" if(suit) suit.name = "refitted [suit.name]" diff --git a/code/modules/clothing/spacesuits/void/station.dm b/code/modules/clothing/spacesuits/void/station.dm index 7bc4d768e36..f7fef200402 100644 --- a/code/modules/clothing/spacesuits/void/station.dm +++ b/code/modules/clothing/spacesuits/void/station.dm @@ -144,4 +144,20 @@ slot_r_hand_str = "sec_hardsuit" ) armor = list(melee = 60, bullet = 10, laser = 30, energy = 5, bomb = 45, bio = 100, rad = 10) - allowed = list(/obj/item/gun,/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/melee/baton) \ No newline at end of file + allowed = list(/obj/item/gun,/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit,/obj/item/melee/baton) + + //Science +/obj/item/clothing/head/helmet/space/void/sci + name = "research voidsuit helmet" + desc = "A special helmet designed for usage by NanoTrasen research personnel in hazardous, low pressure environments." + icon_state = "rig0-sci" + item_state = "research_voidsuit_helmet" + armor = list(melee = 20, bullet = 5, laser = 30, energy = 45, bomb = 25, bio = 100, rad = 75) + +/obj/item/clothing/suit/space/void/sci + icon_state = "rig-sci" + name = "research voidsuit" + desc = "A special suit that designed for usage by NanoTrasen research personnel in hazardous, low pressure environments." + item_state = "research_voidsuit" + allowed = list(/obj/item/device/flashlight,/obj/item/tank,/obj/item/device/suit_cooling_unit) + armor = list(melee = 20, bullet = 5, laser = 30, energy = 45, bomb = 25, bio = 100, rad = 75) \ No newline at end of file diff --git a/html/changelogs/kyres1-rndsuits.yml b/html/changelogs/kyres1-rndsuits.yml new file mode 100644 index 00000000000..d8568cdf3e4 --- /dev/null +++ b/html/changelogs/kyres1-rndsuits.yml @@ -0,0 +1,42 @@ +################################ +# 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: + - rscadd: "Added a new set of R&D suits available in toxins, telescience and expedition prep on the sublevel." + - tweak: "Resprited the AMI suit." diff --git a/icons/mob/feet.dmi b/icons/mob/feet.dmi index 1eebd5bb067..58a549ff013 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 ceb37c9d97d..37c8a7aa00c 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 e536a1b63b9..93dca00c2b5 100644 Binary files a/icons/mob/head.dmi and b/icons/mob/head.dmi differ diff --git a/icons/mob/rig_back.dmi b/icons/mob/rig_back.dmi index 31e39ca85dd..b33501d854e 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 091e1a086a7..a2f1b5e0325 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 d3a6eba498d..7bb074baaff 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 17b55e7cd60..966654ccdea 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 cd675dce18e..0b40761d7eb 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 1c534eb5a88..c00b50a6da1 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 432da6ce1fb..8e745858ce8 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 5b54adf9511..6e2ef0b7d97 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 0b51516d848..f4a2422055e 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 4f84b223181..cbdd667c729 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 09c7699a99e..fa19f3a0e41 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 cb900a58e76..766be3ebbf8 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 95928fa5c88..79099406544 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 3c1e0ae3199..636f44a60aa 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 7db6c042620..3f3b5135d0d 100644 Binary files a/icons/mob/species/unathi/suit.dmi and b/icons/mob/species/unathi/suit.dmi differ diff --git a/icons/mob/suit.dmi b/icons/mob/suit.dmi index a648b80e058..264177bd633 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 0043bc63d71..cc7d64161e3 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 f1bcb7926f1..83304e9c5ea 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 8d54a41cf39..06e847f7033 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 09e43fb664e..832f77bcefa 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 64e84d7504d..5555fb1f04f 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 6138ccb8d3f..0225c63be9d 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 81744badfd4..e84eb9165e1 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 e1126864712..c62c269bc49 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 2bcca92777f..e509f672f2b 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 0ac28eb4ac7..8834a9715aa 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 3d09aedc438..f46be3a6ae6 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/suits.dmi b/icons/obj/clothing/suits.dmi index d5d5661e190..619f8635072 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 d63a56b4ed1..3f06a26f8a9 100644 Binary files a/icons/obj/rig_modules.dmi and b/icons/obj/rig_modules.dmi differ diff --git a/maps/aurora/aurora-3_sublevel.dmm b/maps/aurora/aurora-3_sublevel.dmm index 20c44e4cb7f..70fa7075bba 100644 --- a/maps/aurora/aurora-3_sublevel.dmm +++ b/maps/aurora/aurora-3_sublevel.dmm @@ -11700,12 +11700,12 @@ req_access = list(7) }, /obj/structure/table/rack, -/obj/item/clothing/head/helmet/space/anomaly, -/obj/item/clothing/suit/space/anomaly, /obj/item/clothing/mask/breath, /obj/item/storage/belt/archaeology, /obj/item/clothing/shoes/magboots, /obj/item/clothing/gloves/latex, +/obj/item/clothing/suit/space/void/sci, +/obj/item/clothing/head/helmet/space/void/sci, /turf/simulated/floor/tiled/dark, /area/rnd/eva) "ayr" = ( @@ -11904,12 +11904,12 @@ /obj/machinery/light{ dir = 4 }, -/obj/item/clothing/head/helmet/space/anomaly, -/obj/item/clothing/suit/space/anomaly, /obj/item/clothing/mask/breath, /obj/item/storage/belt/archaeology, /obj/item/clothing/shoes/magboots, /obj/item/clothing/gloves/latex, +/obj/item/clothing/suit/space/void/sci, +/obj/item/clothing/head/helmet/space/void/sci, /turf/simulated/floor/tiled/dark, /area/rnd/eva) "ayS" = ( @@ -12259,12 +12259,12 @@ req_access = list(7) }, /obj/structure/table/rack, -/obj/item/clothing/head/helmet/space/anomaly, -/obj/item/clothing/suit/space/anomaly, /obj/item/clothing/mask/breath, /obj/item/storage/belt/archaeology, /obj/item/clothing/shoes/magboots, /obj/item/clothing/gloves/latex, +/obj/item/clothing/suit/space/void/sci, +/obj/item/clothing/head/helmet/space/void/sci, /turf/simulated/floor/tiled/dark, /area/rnd/eva) "azs" = ( @@ -13079,6 +13079,7 @@ /obj/machinery/light{ dir = 1 }, +/obj/machinery/recharge_station, /turf/simulated/floor/tiled/white, /area/outpost/research/hallway) "aBd" = ( @@ -26185,6 +26186,7 @@ icon_state = "corner_white"; dir = 4 }, +/obj/machinery/portable_atmospherics/canister/oxygen, /turf/simulated/floor/tiled, /area/rnd/mixing) "bkF" = ( @@ -26661,7 +26663,7 @@ pixel_x = 25; pixel_y = 0 }, -/obj/machinery/portable_atmospherics/canister/oxygen, +/obj/structure/dispenser/oxygen, /turf/simulated/floor/tiled, /area/rnd/mixing) "blW" = ( @@ -26751,7 +26753,7 @@ icon_state = "corner_white"; dir = 10 }, -/obj/machinery/suit_storage_unit/standard_unit, +/obj/machinery/suit_cycler/science, /turf/simulated/floor/tiled, /area/rnd/mixing) "bmj" = ( @@ -26759,7 +26761,25 @@ icon_state = "corner_white_full"; dir = 4 }, -/obj/structure/dispenser/oxygen, +/obj/structure/table/rack{ + dir = 8; + layer = 2.9 + }, +/obj/item/clothing/suit/space/void/sci, +/obj/item/clothing/shoes/magboots, +/obj/item/clothing/mask/breath, +/obj/machinery/door/window/northright{ + name = "Toxins suit storage" + }, +/obj/structure/window/reinforced{ + icon_state = "rwindow"; + dir = 4 + }, +/obj/structure/window/reinforced, +/obj/structure/window/reinforced{ + dir = 8 + }, +/obj/item/clothing/head/helmet/space/void/sci, /turf/simulated/floor/tiled, /area/rnd/mixing) "bmC" = ( @@ -33050,7 +33070,7 @@ /area/medical/patient_a) "pFa" = ( /obj/machinery/atmospherics/pipe/manifold/hidden, -/obj/machinery/recharge_station, +/obj/machinery/suit_cycler/science, /turf/simulated/floor/tiled, /area/rnd/eva) "pHa" = ( @@ -36514,9 +36534,15 @@ icon_state = "intact"; dir = 6 }, -/obj/random/loot, /obj/effect/decal/cleanable/cobweb, -/obj/structure/closet, +/obj/item/clothing/suit/space/anomaly, +/obj/item/clothing/suit/space/anomaly, +/obj/item/clothing/head/helmet/space/anomaly, +/obj/item/clothing/head/helmet/space/anomaly, +/obj/structure/closet{ + desc = "A dusty old locker."; + name = "old suit storage" + }, /turf/simulated/floor/plating, /area/maintenance/scisublevel) "wCR" = ( diff --git a/maps/aurora/aurora-4_mainlevel.dmm b/maps/aurora/aurora-4_mainlevel.dmm index 90f031cb942..8f1dc75dc24 100644 --- a/maps/aurora/aurora-4_mainlevel.dmm +++ b/maps/aurora/aurora-4_mainlevel.dmm @@ -50752,11 +50752,22 @@ /turf/simulated/floor/tiled/white, /area/rnd/research) "bHV" = ( -/obj/machinery/suit_storage_unit/standard_unit, +/obj/machinery/suit_cycler/science, +/obj/structure/window/reinforced{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, /area/rnd/telesci) "bHW" = ( -/obj/structure/closet/bombcloset, +/obj/structure/table/rack, +/obj/item/clothing/suit/space/void/sci, +/obj/item/clothing/head/helmet/space/void/sci, +/obj/item/clothing/shoes/magboots, +/obj/item/tank/oxygen, +/obj/structure/window/reinforced{ + icon_state = "rwindow"; + dir = 4 + }, /turf/simulated/floor/tiled/dark, /area/rnd/telesci) "bHX" = ( @@ -69091,6 +69102,9 @@ icon_state = "rwindow"; dir = 4 }, +/obj/structure/window/reinforced{ + dir = 8 + }, /turf/simulated/floor/tiled/dark, /area/rnd/telesci) "pDF" = (