R&D voidsuits + AMI resprite (#7541)

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]"

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)
+	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)

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."

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" = (

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" = (