Merge branch 'master' into giant_armored_seprentids

ss220club · Oct 17, 2024 · 6ed004c · 6ed004c
2 parents 28c8c4f + 80cc92c
commit 6ed004c
Show file tree

Hide file tree

Showing 6 changed files with 69 additions and 34 deletions.
diff --git a/modular_ss220/antagonists/code/vox_raider/clothing/vox_clothing.dm b/modular_ss220/antagonists/code/vox_raider/clothing/vox_clothing.dm
@@ -41,37 +41,3 @@
 	name = "vox purple jumpsuit"
 	icon_state = "vox-jumpsuit_purple"
 	item_color = "vox-jumpsuit_purple"
-
-// ================
-//		loadout
-/datum/gear/racial/vox_jumpsuit
-	display_name = "vox work jumpsuit"
-	description = "These loose clothes are optimized for the labors of the lower castes onboard the arkships. Large openings in the top allow for breathability while the pants are durable yet flexible enough to not restrict movement."
-	path = /obj/item/clothing/under/vox/jumpsuit
-	slot = SLOT_HUD_JUMPSUIT
-
-/datum/gear/racial/vox_jumpsuit/red
-	display_name = "vox red jumpsuit"
-	path = /obj/item/clothing/under/vox/jumpsuit/red
-
-/datum/gear/racial/vox_jumpsuit/teal
-	display_name = "vox teal jumpsuit"
-	path = /obj/item/clothing/under/vox/jumpsuit/teal
-
-/datum/gear/racial/vox_jumpsuit/blue
-	display_name = "vox blue jumpsuit"
-	path = /obj/item/clothing/under/vox/jumpsuit/blue
-
-/datum/gear/racial/vox_jumpsuit/green
-	display_name = "vox green jumpsuit"
-	path = /obj/item/clothing/under/vox/jumpsuit/green
-
-/datum/gear/racial/vox_jumpsuit/yellow
-	display_name = "vox yellow jumpsuit"
-	path = /obj/item/clothing/under/vox/jumpsuit/yellow
-
-/datum/gear/racial/vox_jumpsuit/purple
-	display_name = "vox purple jumpsuit"
-	path = /obj/item/clothing/under/vox/jumpsuit/purple
-
-// ================
diff --git a/modular_ss220/antagonists/code/vox_raider/clothing/vox_gloves.dm b/modular_ss220/antagonists/code/vox_raider/clothing/vox_gloves.dm
@@ -16,6 +16,15 @@
 	resistance_flags = NONE
 	armor = list(MELEE = 30, BULLET = 0, LASER = 10, ENERGY = 10, BOMB = 0, RAD = 0, FIRE = 200, ACID = 50)
 
+/obj/item/clothing/gloves/vox/light
+	name = "light vox gauntlets"
+	desc = "Легкие рукавицы причудливой формы с когтями."
+	strip_delay = 2 SECONDS
+	cold_protection = 0
+	min_cold_protection_temperature = NONE
+	max_heat_protection_temperature = NONE
+	armor = NONE
+
 /obj/item/clothing/gloves/color/yellow/vox
 	name = "insulated vox gauntlets"
 	desc = "Плотные изоляционные рукавицы причудливой формы с когтями."

diff --git a/modular_ss220/loadout/_loadout.dme b/modular_ss220/loadout/_loadout.dme
@@ -2,6 +2,7 @@
 
 #include "code/donor.dm"
 #include "code/donor_items.dm"
+#include "code/racial.dm"
 #include "code/removal.dm"
 #include "code/shoes.dm"
 #include "code/suit.dm"

diff --git a/modular_ss220/loadout/code/racial.dm b/modular_ss220/loadout/code/racial.dm
@@ -0,0 +1,42 @@
+// MARK: Vox
+
+/datum/gear/racial/vox_sandal
+	display_name = "Vox sandals"
+	path = /obj/item/clothing/shoes/roman/vox
+	slot = SLOT_HUD_SHOES
+
+/datum/gear/racial/vox_gauntlets
+	display_name = "Vox gauntlets"
+	path = /obj/item/clothing/gloves/vox/light
+	slot = SLOT_HUD_GLOVES
+
+/datum/gear/racial/vox_jumpsuit
+	display_name = "Vox work jumpsuit"
+	description = "These loose clothes are optimized for the labors of the lower castes onboard the arkships. Large openings in the top allow for breathability while the pants are durable yet flexible enough to not restrict movement."
+	path = /obj/item/clothing/under/vox/jumpsuit
+	slot = SLOT_HUD_JUMPSUIT
+
+/datum/gear/racial/vox_jumpsuit/red
+	display_name = "Vox red jumpsuit"
+	path = /obj/item/clothing/under/vox/jumpsuit/red
+
+/datum/gear/racial/vox_jumpsuit/teal
+	display_name = "Vox teal jumpsuit"
+	path = /obj/item/clothing/under/vox/jumpsuit/teal
+
+/datum/gear/racial/vox_jumpsuit/blue
+	display_name = "Vox blue jumpsuit"
+	path = /obj/item/clothing/under/vox/jumpsuit/blue
+
+/datum/gear/racial/vox_jumpsuit/green
+	display_name = "Vox green jumpsuit"
+	path = /obj/item/clothing/under/vox/jumpsuit/green
+
+/datum/gear/racial/vox_jumpsuit/yellow
+	display_name = "Vox yellow jumpsuit"
+	path = /obj/item/clothing/under/vox/jumpsuit/yellow
+
+/datum/gear/racial/vox_jumpsuit/purple
+	display_name = "Vox purple jumpsuit"
+	path = /obj/item/clothing/under/vox/jumpsuit/purple
+
diff --git a/modular_ss220/vending/code/vending.dm b/modular_ss220/vending/code/vending.dm
@@ -222,6 +222,9 @@
 						/obj/item/clothing/under/rainbow_skirt = 100)
 	. = ..()
 
+/obj/machinery/economy/vending/suitdispenser/free
+	prices = list()
+
 /obj/machinery/economy/vending/wallmed/emergency_ntmed
 	name = "\improper Advanced Nanomed"
 	desc = "Продвинутая экстренная аптечка на все случаи жизни."
@@ -242,3 +245,14 @@
 	contraband |= list(/obj/item/clothing/shoes/clown_shoes/moffers = 1)
 	prices |= list(/obj/item/clothing/shoes/clown_shoes/moffers = 80)
 	. = ..()
+
+/obj/machinery/economy/vending/shoedispenser/free
+	prices = list()
+
+/obj/machinery/economy/vending/engidrobe/Initialize(mapload)
+	contraband |= list(/obj/item/clothing/gloves/color/yellow/vox = 1)
+	prices |= list(/obj/item/clothing/gloves/color/yellow/vox = 300)
+	. = ..()
+
+/obj/machinery/economy/vending/engidrobe/free
+	prices = list()
diff --git a/modular_ss220/vending/code/vending_food.dm b/modular_ss220/vending/code/vending_food.dm
@@ -45,6 +45,9 @@
 		/obj/item/poster/mac_vulpix = 3,
 	)
 
+/obj/machinery/economy/vending/vulpix/free
+	prices = list()
+
 // MARK: Nanotrasen Food
 /obj/machinery/economy/vending/nt_food
 	name = "\improper Nanotrasen Food"