OBS members now get a recolored syndie suit (#511)

vlggms · Jan 26, 2024 · ace46c9 · ace46c9
1 parent 21aeec3
commit ace46c9
Show file tree

Hide file tree

Showing 8 changed files with 41 additions and 1 deletion.
diff --git a/code/modules/clothing/spacesuits/void/merc.dm b/code/modules/clothing/spacesuits/void/merc.dm
@@ -67,3 +67,23 @@
 	helmet = /obj/item/clothing/head/helmet/space/void/merc
 	boots = /obj/item/clothing/shoes/magboots
 	tank = /obj/item/tank/oxygen
+
+// OBS - "Dark Eclipse"
+/obj/item/clothing/head/helmet/space/void/merc/obs
+	name = "dark eclipse voidsuit helmet"
+	desc = "An advanced helmet that clearly took \"inspirations\" from Gorlex Marauders design. This one comes in pure black colors."
+	icon_state = "rig0-syndie-obs"
+	item_state = "syndie_helm_obs"
+	species_restricted = list(SPECIES_HUMAN)
+	camera = null
+
+/obj/item/clothing/suit/space/void/merc/obs
+	name = "dark eclipse voidsuit"
+	desc = "An advanced suit that clearly took \"inspirations\" from Gorlex Marauders design. This one comes in pure black colors"
+	icon_state = "rig-syndie-obs"
+	species_restricted = list(SPECIES_HUMAN)
+
+/obj/item/clothing/suit/space/void/merc/obs/prepared
+	helmet = /obj/item/clothing/head/helmet/space/void/merc/obs
+	boots = /obj/item/clothing/shoes/magboots
+	tank = /obj/item/tank/oxygen
diff --git a/icons/mob/onmob/onmob_head.dmi b/icons/mob/onmob/onmob_head.dmi
diff --git a/icons/mob/onmob/onmob_suit.dmi b/icons/mob/onmob/onmob_suit.dmi
diff --git a/icons/obj/clothing/obj_head.dmi b/icons/obj/clothing/obj_head.dmi
diff --git a/icons/obj/clothing/obj_suit.dmi b/icons/obj/clothing/obj_suit.dmi
diff --git a/maps/away/obs_shuttle/obs_shuttle.dm b/maps/away/obs_shuttle/obs_shuttle.dm
@@ -1,5 +1,6 @@
-#include "obs_shuttle_jobs.dm"
 #include "obs_shuttle_areas.dm"
+#include "obs_shuttle_jobs.dm"
+#include "obs_shuttle_objects.dm"
 
 /datum/map_template/ruin/away_site/obs_shuttle
 	name = "OBS Shuttle"

diff --git a/maps/away/obs_shuttle/obs_shuttle_jobs.dm b/maps/away/obs_shuttle/obs_shuttle_jobs.dm
@@ -177,6 +177,16 @@
 	gloves = /obj/item/clothing/gloves/latex
 	suit = /obj/item/clothing/suit/storage/toggle/labcoat
 
+// Just for quick admin spawns
+/decl/hierarchy/outfit/job/obs/member/equipped
+	name = ("OBS - Job - Equipped Operative")
+	suit = /obj/item/clothing/suit/space/void/merc/obs
+	mask = /obj/item/clothing/mask/gas/syndicate
+	head = /obj/item/clothing/head/helmet/space/void/merc/obs
+	suit_store = /obj/item/tank/oxygen
+
+	r_hand = /obj/item/gun/projectile/automatic/ak47
+
 /obj/effect/submap_landmark/spawnpoint/obs_shuttle
 	name = "OBS Member"
 	movable_flags = MOVABLE_FLAG_EFFECTMOVE

diff --git a/maps/away/obs_shuttle/obs_shuttle_objects.dm b/maps/away/obs_shuttle/obs_shuttle_objects.dm
@@ -0,0 +1,9 @@
+/obj/machinery/suit_storage_unit/obs
+	name = "Dark Eclipse Voidsuit Storage Unit"
+	suit= /obj/item/clothing/suit/space/void/merc/obs
+	helmet = /obj/item/clothing/head/helmet/space/void/merc/obs
+	boots = /obj/item/clothing/shoes/magboots
+	tank = /obj/item/tank/oxygen
+	mask = /obj/item/clothing/mask/breath
+	req_access = list(access_obs_shuttle)
+	islocked = TRUE