Merge pull request BoHBranch#1460 from Rayfod/Vox-sleeper

Vox map changes/various vox fixes/ascent sleeper fix
cdb-is-not-good · Mar 10, 2022 · f45868e · f45868e
2 parents 25e4925 + 9fadd4d
commit f45868e
Show file tree

Hide file tree

Showing 9 changed files with 111 additions and 61 deletions.
diff --git a/baystation12.dme b/baystation12.dme
@@ -3224,6 +3224,7 @@
 #include "code\modules\ventcrawl\ventcrawl_atmospherics.dm"
 #include "code\modules\ventcrawl\ventcrawl_multiz.dm"
 #include "code\modules\ventcrawl\ventcrawl_verb.dm"
+#include "code\modules\Vox2\vox_machines.dm"
 #include "code\modules\vueui\external.dm"
 #include "code\modules\vueui\ui.dm"
 #include "code\modules\vueui\var_monitor.dm"

diff --git a/code/modules/Vox2/vox_machines.dm b/code/modules/Vox2/vox_machines.dm
@@ -0,0 +1,11 @@
+/obj/machinery/sleeper/vox
+	name = "vox sleeper"
+	desc = "Some kind of strange alien sleeper technology."
+	icon = 'icons/obj/vox_medical.dmi'
+	base_type = /obj/machinery/sleeper
+	construct_state = /decl/machine_construction/default/no_deconstruct
+	available_chemicals = list("Inaprovaline" = /datum/reagent/inaprovaline, "Soporific" = /datum/reagent/soporific, "Paracetamol" = /datum/reagent/paracetamol, "Dylovene" = /datum/reagent/dylovene, "Ammonia" = /datum/reagent/ammonia, "Adrenaline" = /datum/reagent/adrenaline, "Iron" = /datum/reagent/iron)
+	base_chemicals = list("Inaprovaline" = /datum/reagent/inaprovaline, "Soporific" = /datum/reagent/soporific, "Paracetamol" = /datum/reagent/paracetamol, "Dylovene" = /datum/reagent/dylovene, "Ammonia" = /datum/reagent/ammonia, "Adrenaline" = /datum/reagent/adrenaline, "Iron" = /datum/reagent/iron)
+
+/obj/machinery/sleeper/ascent/Initialize(mapload, d, populate_parts)
+	. = ..()
diff --git a/code/modules/ascent/ascent_machines.dm b/code/modules/ascent/ascent_machines.dm
@@ -67,11 +67,12 @@ MANTIDIFY(/obj/machinery/door/airlock/external/bolted, "mantid airlock", "door")
 	icon = 'icons/obj/ascent_sleepers.dmi'
 	base_type = /obj/machinery/sleeper
 	construct_state = /decl/machine_construction/default/no_deconstruct
+	available_chemicals = list("Inaprovaline" = /datum/reagent/inaprovaline, "Soporific" = /datum/reagent/soporific, "Tramadol" = /datum/reagent/tramadol, "Dylovene" = /datum/reagent/dylovene, "Dexalin Plus" = /datum/reagent/dexalinp, "Crystalizing Agent" = /datum/reagent/crystal, "Bromide" = /datum/reagent/toxin/bromide, "Peridaxon" = /datum/reagent/peridaxon, "Alkysine" = /datum/reagent/alkysine, "Kelotane" = /datum/reagent/kelotane, "Bicaridine" = /datum/reagent/bicaridine, "Hyronalin" = /datum/reagent/hyronalin)
+	base_chemicals = list("Inaprovaline" = /datum/reagent/inaprovaline, "Soporific" = /datum/reagent/soporific, "Tramadol" = /datum/reagent/tramadol, "Dylovene" = /datum/reagent/dylovene, "Dexalin Plus" = /datum/reagent/dexalinp, "Crystalizing Agent" = /datum/reagent/crystal, "Bromide" = /datum/reagent/toxin/bromide, "Peridaxon" = /datum/reagent/peridaxon, "Alkysine" = /datum/reagent/alkysine, "Kelotane" = /datum/reagent/kelotane, "Bicaridine" = /datum/reagent/bicaridine, "Hyronalin" = /datum/reagent/hyronalin)
 
 /obj/machinery/sleeper/ascent/Initialize(mapload, d, populate_parts)
 	. = ..()
-	base_chemicals["Crystalizing Agent"] = /datum/reagent/crystal
-	base_chemicals["Bromide"] = /datum/reagent/toxin/bromide
+
 
 /obj/machinery/fabricator/ascent
 	name = "\improper Ascent nanofabricator"

diff --git a/code/modules/species/outsider/vox.dm b/code/modules/species/outsider/vox.dm
@@ -51,7 +51,6 @@
 	poison_types = list(GAS_OXYGEN = TRUE)
 	siemens_coefficient = 0.2
 
-	species_flags = SPECIES_FLAG_NO_SCAN
 	spawn_flags = SPECIES_CAN_JOIN// | SPECIES_IS_WHITELISTED
 	appearance_flags = HAS_EYE_COLOR | HAS_HAIR_COLOR
 

diff --git a/code/unit_tests/mob_tests.dm b/code/unit_tests/mob_tests.dm
@@ -357,7 +357,6 @@ datum/unit_test/mob_damage/halloss
 /datum/unit_test/mob_damage/vox/clone
 	name = "MOB: Vox Clone Damage Check"
 	damagetype = CLONE
-	expected_vulnerability = IMMUNE
 
 
 /datum/unit_test/mob_damage/vox/halloss
@@ -618,7 +617,7 @@ datum/unit_test/mob_damage/halloss
 
 	for(var/mobtype in subtypesof(/mob/living))
 
-		// Humans use species for their products and are 
+		// Humans use species for their products and are
 		// difficult to properly unit test because of this.
 		if(ispath(mobtype, /mob/living/carbon/human))
 			continue

diff --git a/icons/obj/vox_medical.dmi b/icons/obj/vox_medical.dmi
diff --git a/maps/away/voxship/voxship-1.dmm b/maps/away/voxship/voxship-1.dmm
@@ -128,7 +128,6 @@
 /area/voxship/engineering)
 "bK" = (
 /obj/structure/table/rack,
-/obj/item/weapon/gun/projectile/dartgun/vox/raider,
 /obj/item/weapon/rig/vox,
 /obj/item/clothing/glasses/night,
 /turf/simulated/floor/reinforced/vox,
@@ -406,7 +405,7 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/turf/simulated/floor/reinforced,
+/turf/simulated/floor/reinforced/vox,
 /area/voxship/dock)
 "ex" = (
 /obj/machinery/atmospherics/unary/vent_pump/high_volume{
@@ -436,7 +435,6 @@
 /obj/item/weapon/gun/energy/ionrifle/small,
 /obj/random/projectile,
 /obj/random/projectile,
-/obj/random/projectile,
 /turf/simulated/floor/reinforced/vox,
 /area/voxship/armory)
 "eF" = (
@@ -590,7 +588,7 @@
 	dir = 1;
 	icon_state = "handrail"
 	},
-/turf/simulated/floor/reinforced,
+/turf/simulated/floor/reinforced/vox,
 /area/voxship/dock)
 "fH" = (
 /obj/machinery/atmospherics/pipe/simple/visible/yellow,
@@ -930,7 +928,7 @@
 	dir = 1;
 	icon_state = "shuttle_chair_preview"
 	},
-/turf/simulated/floor/reinforced,
+/turf/simulated/floor/reinforced/vox,
 /area/voxship/dock)
 "hR" = (
 /obj/machinery/portable_atmospherics/canister/hydrogen,
@@ -959,6 +957,8 @@
 /obj/item/clothing/glasses/night,
 /obj/item/clothing/glasses/night,
 /obj/machinery/atmospherics/unary/vent_pump/on,
+/obj/item/clothing/suit/space/vox/carapace,
+/obj/item/clothing/head/helmet/space/vox/carapace,
 /turf/simulated/floor/reinforced/vox,
 /area/voxship/armory)
 "ib" = (
@@ -1152,6 +1152,9 @@
 /obj/machinery/atmospherics/unary/vent_pump/on{
 	dir = 1
 	},
+/obj/machinery/sleeper/vox{
+	dir = 1
+	},
 /turf/simulated/floor/reinforced/vox,
 /area/voxship/shuttle)
 "kl" = (
@@ -1450,7 +1453,7 @@
 	dir = 1;
 	icon_state = "handrail"
 	},
-/turf/simulated/floor/reinforced,
+/turf/simulated/floor/reinforced/vox,
 /area/voxship/dock)
 "me" = (
 /obj/machinery/atmospherics/pipe/simple/hidden{
@@ -1671,7 +1674,7 @@
 	info = "<i>Look, who ever was flying this to drop it off, MUST have flown in to like 70 rocks on the way. Its SKREKING BUSTED, so till I fix it no combat shuttle till I fix it</i>";
 	name = "CE's note for you skreks"
 	},
-/turf/simulated/floor/reinforced,
+/turf/simulated/floor/reinforced/vox,
 /area/voxship/dock)
 "oo" = (
 /obj/machinery/conveyor/ammobelt{
@@ -1837,10 +1840,12 @@
 /obj/item/weapon/tank/jetpack/nitrogen,
 /obj/item/weapon/tank/jetpack/nitrogen,
 /obj/item/weapon/tank/jetpack/nitrogen,
-/obj/machinery/atmospherics/pipe/simple/hidden/supply{
+/obj/item/weapon/tank/jetpack/nitrogen,
+/obj/item/weapon/tank/jetpack/nitrogen,
+/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
 	dir = 4
 	},
-/obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
+/obj/machinery/atmospherics/pipe/simple/hidden/supply{
 	dir = 4
 	},
 /turf/simulated/floor/reinforced/vox,
@@ -1858,7 +1863,7 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/turf/simulated/floor/reinforced,
+/turf/simulated/floor/reinforced/vox,
 /area/voxship/dock)
 "oU" = (
 /obj/structure/cable{
@@ -1879,7 +1884,7 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/turf/simulated/floor/reinforced,
+/turf/simulated/floor/reinforced/vox,
 /area/voxship/dock)
 "pe" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -1927,7 +1932,7 @@
 	dir = 1
 	},
 /obj/machinery/atmospherics/unary/vent_pump/on,
-/turf/simulated/floor/reinforced,
+/turf/simulated/floor/reinforced/vox,
 /area/voxship/dock)
 "pt" = (
 /obj/machinery/door/blast/regular{
@@ -1941,7 +1946,7 @@
 /area/space)
 "pH" = (
 /obj/machinery/hologram/holopad/longrange,
-/turf/simulated/floor/reinforced,
+/turf/simulated/floor/reinforced/vox,
 /area/voxship/dock)
 "pL" = (
 /obj/effect/floor_decal/industrial/warning{
@@ -2643,7 +2648,7 @@
 	desc = "The plaque on this Ramsled reads; And so we the Auralis give onto thee the means to speedy flight, to deliver your murder into their hearts.";
 	name = "Ramsled"
 	},
-/turf/simulated/floor/reinforced,
+/turf/simulated/floor/reinforced/vox,
 /area/voxship/dock)
 "vh" = (
 /obj/structure/window/reinforced{
@@ -3335,6 +3340,8 @@
 	},
 /obj/item/clothing/glasses/night,
 /obj/item/clothing/glasses/night,
+/obj/item/clothing/suit/space/vox/stealth,
+/obj/item/clothing/head/helmet/space/vox/stealth,
 /turf/simulated/floor/reinforced/vox,
 /area/voxship/armory)
 "Cf" = (
@@ -3470,8 +3477,15 @@
 /turf/simulated/floor/reinforced/vox,
 /area/voxship/armory)
 "Dn" = (
-/turf/simulated/floor/reinforced,
-/area/voxship/dock)
+/obj/structure/table/rack,
+/obj/item/weapon/gun/energy/darkmatter,
+/obj/item/weapon/gun/energy/darkmatter,
+/obj/item/weapon/gun/energy/darkmatter,
+/obj/item/weapon/gun/energy/darkmatter,
+/obj/item/weapon/gun/energy/darkmatter,
+/obj/item/weapon/gun/energy/darkmatter,
+/turf/simulated/floor/reinforced/vox,
+/area/voxship/armory)
 "Dv" = (
 /obj/machinery/atmospherics/unary/vent_pump/high_volume{
 	dir = 1;
@@ -3847,6 +3861,8 @@
 /obj/item/clothing/glasses/night,
 /obj/item/clothing/glasses/night,
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
+/obj/item/clothing/suit/space/vox/medic,
+/obj/item/clothing/head/helmet/space/vox/medic,
 /turf/simulated/floor/reinforced/vox,
 /area/voxship/armory)
 "GU" = (
@@ -4095,7 +4111,7 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/turf/simulated/floor/reinforced,
+/turf/simulated/floor/reinforced/vox,
 /area/voxship/dock)
 "IT" = (
 /obj/machinery/atmospherics/unary/tank/carbon_dioxide{
@@ -4442,7 +4458,7 @@
 	d2 = 8;
 	icon_state = "1-8"
 	},
-/turf/simulated/floor/reinforced,
+/turf/simulated/floor/reinforced/vox,
 /area/voxship/dock)
 "Lv" = (
 /obj/effect/catwalk_plated,
@@ -4474,6 +4490,8 @@
 	},
 /obj/item/clothing/glasses/night,
 /obj/item/clothing/glasses/night,
+/obj/item/clothing/head/helmet/space/vox/pressure,
+/obj/item/clothing/suit/space/vox/pressure,
 /turf/simulated/floor/reinforced/vox,
 /area/voxship/armory)
 "Lz" = (
@@ -4679,7 +4697,6 @@
 "NY" = (
 /obj/structure/table/reinforced,
 /obj/item/stack/material/steel/fifty,
-/obj/item/stack/material/plastic,
 /obj/item/stack/material/glass/fifty,
 /obj/item/stack/material/aluminium/fifty,
 /obj/machinery/atmospherics/pipe/simple/hidden/scrubbers{
@@ -4691,6 +4708,7 @@
 /obj/machinery/light{
 	dir = 1
 	},
+/obj/item/stack/material/plastic/fifty,
 /turf/simulated/floor/reinforced/vox,
 /area/voxship/armory)
 "NZ" = (
@@ -5066,7 +5084,7 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/turf/simulated/floor/reinforced,
+/turf/simulated/floor/reinforced/vox,
 /area/voxship/dock)
 "Rc" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/supply,
@@ -5249,7 +5267,7 @@
 /area/voxship/ofd)
 "SM" = (
 /obj/structure/window/phoronreinforced,
-/turf/simulated/floor/reinforced,
+/turf/simulated/floor/reinforced/vox,
 /area/voxship/dock)
 "SP" = (
 /obj/machinery/atmospherics/pipe/simple/hidden/red,
@@ -5440,7 +5458,7 @@
 	d2 = 8;
 	icon_state = "4-8"
 	},
-/turf/simulated/floor/reinforced,
+/turf/simulated/floor/reinforced/vox,
 /area/voxship/dock)
 "UW" = (
 /obj/machinery/computer/ship/engines{
@@ -5727,7 +5745,7 @@
 	pixel_y = -22;
 	req_access = list("ACCESS_VOXSHIP")
 	},
-/turf/simulated/floor/reinforced,
+/turf/simulated/floor/reinforced/vox,
 /area/voxship/dock)
 "XH" = (
 /obj/machinery/atmospherics/pipe/simple/visible/red{
@@ -16014,7 +16032,7 @@ eK
 vo
 Nx
 YO
-qK
+Dn
 fQ
 YO
 aZ
@@ -17689,7 +17707,7 @@ SM
 ev
 fw
 HX
-Dn
+ZW
 ZW
 qk
 ZW
@@ -17988,13 +18006,13 @@ ZW
 ZW
 tt
 AN
-Dn
+ZW
 HX
 Cf
 ZW
 hQ
 HX
-Dn
+ZW
 el
 sP
 ZW
@@ -18295,8 +18313,8 @@ HX
 HX
 Kt
 Ra
-Dn
-Dn
+ZW
+ZW
 XF
 HX
 aj
@@ -18447,7 +18465,7 @@ mh
 dt
 EO
 Lr
-Dn
+ZW
 pr
 Ht
 aj