tweak: edit armor for gloves and boots from armory (#6254)

* Статы * Статы ботинок и перчей, новые риот боты и перчи, перестановка оружейки, новые боты в оружейке * Ещё немного перестановок в оружейке * Ещё немного * rrrrrr * Фалсе * Декали, сортировка, пиксельшифт, карго, сумки * nova fix * nova back * grey riot helmet fix * Вернул всё после перестановки
ss220-space · Jan 4, 2025 · e0a7853 · e0a7853
1 parent 35f2855
commit e0a7853
Show file tree

Hide file tree

Showing 24 changed files with 4,454 additions and 4,386 deletions.
diff --git a/_maps/map_files/Delta/delta.dmm b/_maps/map_files/Delta/delta.dmm
diff --git a/_maps/map_files/celestation/celestation.dmm b/_maps/map_files/celestation/celestation.dmm
diff --git a/_maps/map_files/cerestation/cerestation.dmm b/_maps/map_files/cerestation/cerestation.dmm
diff --git a/_maps/map_files/cyberiad/cyberiad.dmm b/_maps/map_files/cyberiad/cyberiad.dmm
diff --git a/_maps/map_files/nova/nova.dmm b/_maps/map_files/nova/nova.dmm
@@ -88123,10 +88123,10 @@
 	req_access = list(1);
 	color = "red"
 	},
-/obj/item/clothing/gloves/combat,
-/obj/item/clothing/gloves/combat,
-/obj/item/clothing/gloves/combat,
-/obj/item/clothing/gloves/combat,
+/obj/item/clothing/gloves/combat/riot,
+/obj/item/clothing/gloves/combat/riot,
+/obj/item/clothing/gloves/combat/riot,
+/obj/item/clothing/gloves/combat/riot,
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},
@@ -141901,6 +141901,10 @@
 /obj/item/shield/riot,
 /obj/item/shield/riot,
 /obj/item/shield/riot,
+/obj/item/clothing/shoes/combat/riot,
+/obj/item/clothing/shoes/combat/riot,
+/obj/item/clothing/shoes/combat/riot,
+/obj/item/clothing/shoes/combat/riot,
 /turf/simulated/floor/plasteel{
 	icon_state = "dark"
 	},

diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm
@@ -497,26 +497,20 @@ GLOBAL_LIST_INIT(all_supply_groups, list(SUPPLY_EMERGENCY,SUPPLY_SECURITY,SUPPLY
 
 /datum/supply_packs/security/armory/riothelmets
 	name = "Riot Bundle Crate"
-	contains = list(/obj/item/clothing/head/helmet/riot,
-					/obj/item/clothing/head/helmet/riot,
-					/obj/item/clothing/head/helmet/riot,
+	contains = list(/obj/item/storage/backpack/duffel/security/riot_armory,
+					/obj/item/storage/backpack/duffel/security/riot_armory,
+					/obj/item/storage/backpack/duffel/security/riot_armory,
 					/obj/item/shield/riot,
 					/obj/item/shield/riot,
-					/obj/item/shield/riot,
-					/obj/item/clothing/suit/armor/riot,
-					/obj/item/clothing/suit/armor/riot,
-					/obj/item/clothing/suit/armor/riot)
+					/obj/item/shield/riot)
 	cost = 80
 	containername = "riot bundle crate"
 
 /datum/supply_packs/security/armory/bulletarmor
 	name = "Bulletproof Armor Crate"
-	contains = list(/obj/item/clothing/suit/armor/bulletproof,
-					/obj/item/clothing/suit/armor/bulletproof,
-					/obj/item/clothing/suit/armor/bulletproof,
-					/obj/item/clothing/head/helmet/alt,
-					/obj/item/clothing/head/helmet/alt,
-					/obj/item/clothing/head/helmet/alt)
+	contains = list(/obj/item/storage/backpack/duffel/security/bulletproof_armory,
+					/obj/item/storage/backpack/duffel/security/bulletproof_armory,
+					/obj/item/storage/backpack/duffel/security/bulletproof_armory)
 	cost = 40
 	containername = "tactical armor crate"
 

diff --git a/code/game/objects/items/weapons/storage/backpack.dm b/code/game/objects/items/weapons/storage/backpack.dm
@@ -750,8 +750,8 @@
 /obj/item/storage/backpack/duffel/security/riot/populate_contents()
 	new /obj/item/clothing/head/helmet/riot (src)
 	new /obj/item/clothing/suit/armor/riot (src)
-	new /obj/item/clothing/gloves/combat (src)
-	new /obj/item/clothing/shoes/combat/swat (src)
+	new /obj/item/clothing/gloves/combat/riot (src)
+	new /obj/item/clothing/shoes/combat/riot (src)
 	new /obj/item/melee/baton (src)
 	new /obj/item/shield/riot/tele (src)
 	new /obj/item/gun/energy/gun/pdw9 (src)
@@ -760,6 +760,24 @@
 	new /obj/item/storage/box/zipties (src)
 	new /obj/item/storage/box/bola (src)
 
+/obj/item/storage/backpack/duffel/security/riot_armory
+	name = "Riot Armor Kit"
+
+/obj/item/storage/backpack/duffel/security/riot_armory/populate_contents()
+	new /obj/item/clothing/head/helmet/riot (src)
+	new /obj/item/clothing/suit/armor/riot (src)
+	new /obj/item/clothing/gloves/combat/riot (src)
+	new /obj/item/clothing/shoes/combat/riot (src)
+
+/obj/item/storage/backpack/duffel/security/bulletproof_armory
+	name = "Bulletproof Armor Kit"
+
+/obj/item/storage/backpack/duffel/security/bulletproof_armory/populate_contents()
+	new /obj/item/clothing/head/helmet/alt (src)
+	new /obj/item/clothing/suit/armor/bulletproof (src)
+	new /obj/item/clothing/gloves/color/black/ballistic (src)
+	new /obj/item/clothing/shoes/jackboots/armored (src)
+
 /obj/item/storage/backpack/duffel/security/war
 	name = "Wartime Emergency Kit"
 

diff --git a/code/modules/clothing/gloves/color.dm b/code/modules/clothing/gloves/color.dm
@@ -145,7 +145,7 @@
 	desc = "Pair of gloves with some protection"
 	icon_state = "armored_gloves"
 	item_state = "armored_gloves"
-	armor = list("melee" = 5, "bullet" = 5, "laser" = 5, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
+	armor = list("melee" = 5, "bullet" = 25, "laser" = 10, "energy" = 5, "bomb" = 5, "bio" = 0, "rad" = 0, "fire" = 75, "acid" = 75)
 	can_be_cut = FALSE
 	sprite_sheets = list(
 		SPECIES_VOX = 'icons/mob/clothing/species/vox/gloves.dmi',

diff --git a/code/modules/clothing/gloves/miscellaneous.dm b/code/modules/clothing/gloves/miscellaneous.dm
@@ -35,8 +35,8 @@
 	transfer_prints = FALSE
 
 /obj/item/clothing/gloves/combat
-	desc = "These tactical gloves are both insulated and offer protection from heat sources."
 	name = "combat gloves"
+	desc = "These tactical gloves are both insulated and offer melee protection."
 	icon_state = "combat"
 	item_state = "swat_gl"
 	siemens_coefficient = 0
@@ -47,7 +47,22 @@
 	heat_protection = HANDS
 	max_heat_protection_temperature = GLOVES_MAX_TEMP_PROTECT
 	resistance_flags = NONE
-	armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 80, "acid" = 50)
+	armor = list("melee" = 25, "bullet" = 5, "laser" = 5, "energy" = 10, "bomb" = 10, "bio" = 0, "rad" = 0, "fire" = 70, "acid" = 70)
+
+/obj/item/clothing/gloves/combat/riot
+	name = "riot gloves"
+	desc = "These riot gloves are both insulated and offer melee protection."
+	icon_state = "riotgloves"
+	item_state = "riotgloves"
+	sprite_sheets = list(
+		SPECIES_VOX = 'icons/mob/clothing/species/vox/gloves.dmi',
+		SPECIES_DRASK = 'icons/mob/clothing/species/drask/gloves.dmi',
+		SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/gloves.dmi',
+		SPECIES_FARWA = 'icons/mob/clothing/species/monkey/gloves.dmi',
+		SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/gloves.dmi',
+		SPECIES_NEARA = 'icons/mob/clothing/species/monkey/gloves.dmi',
+		SPECIES_STOK = 'icons/mob/clothing/species/monkey/gloves.dmi'
+	)
 
 /obj/item/clothing/gloves/bracer
 	name = "bone bracers"

diff --git a/code/modules/clothing/head/helmet.dm b/code/modules/clothing/head/helmet.dm
@@ -126,8 +126,9 @@
 	dog_fashion = null
 	sprite_sheets = list(
 		SPECIES_VOX = 'icons/mob/clothing/species/vox/helmet.dmi',
+		SPECIES_GREY = 'icons/mob/clothing/species/grey/helmet.dmi',
 		SPECIES_VULPKANIN = 'icons/mob/clothing/species/vulpkanin/helmet.dmi'
-		)
+	)
 
 /obj/item/clothing/head/helmet/riot/knight
 	name = "medieval helmet"

diff --git a/code/modules/clothing/shoes/miscellaneous.dm b/code/modules/clothing/shoes/miscellaneous.dm
@@ -16,6 +16,26 @@
 	pickup_sound = 'sound/items/handling/boots_pickup.ogg'
 	drop_sound = 'sound/items/handling/boots_drop.ogg'
 
+/obj/item/clothing/shoes/combat/riot
+	name = "riot boots"
+	desc = "High speed, low drag riot boots."
+	can_cut_open = FALSE
+	icon_state = "riotboots"
+	item_state = "riotboots"
+	sprite_sheets = list(
+		SPECIES_VOX = 'icons/mob/clothing/species/vox/shoes.dmi',
+		SPECIES_DRASK = 'icons/mob/clothing/species/drask/shoes.dmi',
+		SPECIES_MONKEY = 'icons/mob/clothing/species/monkey/shoes.dmi',
+		SPECIES_FARWA = 'icons/mob/clothing/species/monkey/shoes.dmi',
+		SPECIES_WOLPIN = 'icons/mob/clothing/species/monkey/shoes.dmi',
+		SPECIES_NEARA = 'icons/mob/clothing/species/monkey/shoes.dmi',
+		SPECIES_STOK = 'icons/mob/clothing/species/monkey/shoes.dmi',
+		SPECIES_UNATHI = 'icons/mob/clothing/species/unathi/shoes.dmi',
+		SPECIES_ASHWALKER_BASIC = 'icons/mob/clothing/species/unathi/shoes.dmi',
+		SPECIES_ASHWALKER_SHAMAN = 'icons/mob/clothing/species/unathi/shoes.dmi',
+		SPECIES_DRACONOID = 'icons/mob/clothing/species/unathi/shoes.dmi'
+	)
+
 /obj/item/clothing/shoes/combat/swat //overpowered boots for death squads
 	name = "\improper SWAT shoes"
 	desc = "High speed, no drag combat boots."
@@ -155,7 +175,7 @@
 	icon_state = "armored_shoes"
 	item_color = "armored_shoes"
 	item_state = "armored_shoes"
-	armor = list("melee" = 5, "bullet" = 5, "laser" = 5, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0, "fire" = 0, "acid" = 0)
+	armor = list("melee" = 5, "bullet" = 25, "laser" = 10, "energy" = 5, "bomb" = 5, "bio" = 0, "rad" = 0, "fire" = 75, "acid" = 75)
 	sprite_sheets = list(
 		SPECIES_VOX = 'icons/mob/clothing/species/vox/shoes.dmi',
 		SPECIES_DRASK = 'icons/mob/clothing/species/drask/shoes.dmi',

diff --git a/icons/mob/clothing/feet.dmi b/icons/mob/clothing/feet.dmi
diff --git a/icons/mob/clothing/hands.dmi b/icons/mob/clothing/hands.dmi
diff --git a/icons/mob/clothing/species/drask/gloves.dmi b/icons/mob/clothing/species/drask/gloves.dmi
diff --git a/icons/mob/clothing/species/drask/shoes.dmi b/icons/mob/clothing/species/drask/shoes.dmi
diff --git a/icons/mob/clothing/species/monkey/gloves.dmi b/icons/mob/clothing/species/monkey/gloves.dmi
diff --git a/icons/mob/clothing/species/monkey/shoes.dmi b/icons/mob/clothing/species/monkey/shoes.dmi
diff --git a/icons/mob/clothing/species/unathi/shoes.dmi b/icons/mob/clothing/species/unathi/shoes.dmi
diff --git a/icons/mob/clothing/species/vox/gloves.dmi b/icons/mob/clothing/species/vox/gloves.dmi
diff --git a/icons/mob/clothing/species/vox/shoes.dmi b/icons/mob/clothing/species/vox/shoes.dmi
diff --git a/icons/mob/inhands/clothing_lefthand.dmi b/icons/mob/inhands/clothing_lefthand.dmi
diff --git a/icons/mob/inhands/clothing_righthand.dmi b/icons/mob/inhands/clothing_righthand.dmi
diff --git a/icons/obj/clothing/gloves.dmi b/icons/obj/clothing/gloves.dmi
diff --git a/icons/obj/clothing/shoes.dmi b/icons/obj/clothing/shoes.dmi