Port grenade/box sprite, twix stats on beret and jaeger (#181)

* Port grenade/box sprite, twix stats on beret and jaeger * fix * fix * Update leg_plates.dm Signed-off-by: Kirill <[email protected]> * Update arm_plates.dm Signed-off-by: Kirill <[email protected]> * Update chest_plates.dm Signed-off-by: Kirill <[email protected]> * fix * Update mirage.dm Signed-off-by: Kirill <[email protected]> * fix * fix * 1 * 1 --------- Signed-off-by: Kirill <[email protected]>
PMC-Unga-Marines · Sep 4, 2024 · 6c457e8 · 6c457e8
1 parent 17a0b3a
commit 6c457e8
Show file tree

Hide file tree

Showing 16 changed files with 32 additions and 23 deletions.
diff --git a/code/game/objects/items/devices/mirage.dm b/code/game/objects/items/devices/mirage.dm
@@ -4,6 +4,7 @@
 	icon_state = "delivery"
 	item_state = "delivery"
 	dangerous = FALSE
+	overlay_type = "white"
 	///the parent to be copied
 	var/mob/living/current_user
 	///How long the illusory fakes last

diff --git a/code/game/objects/items/explosives/grenades/grenade.dm b/code/game/objects/items/explosives/grenades/grenade.dm
@@ -35,6 +35,7 @@
 	var/power = 105
 	/// Falloff of our explosion, aka distance, by the formula of power / falloff
 	var/falloff = 30
+	var/overlay_type = "red"
 
 
 /obj/item/explosive/grenade/Initialize(mapload)
@@ -93,8 +94,8 @@
 
 /obj/item/explosive/grenade/update_overlays()
 	. = ..()
-	if(active && dangerous)
-		. += new /obj/effect/overlay/danger
+	if(active && overlay_type)
+		. += image('icons/effects/danger.dmi', icon_state = "danger_[overlay_type]")
 
 
 /obj/item/explosive/grenade/proc/prime()

diff --git a/code/game/objects/items/explosives/grenades/marines.dm b/code/game/objects/items/explosives/grenades/marines.dm
@@ -84,6 +84,7 @@
 	light_impact_range = 6
 	power = 150
 	falloff = 25
+	overlay_type = "yellow"
 
 /obj/item/explosive/grenade/sticky
 	name = "\improper M40 adhesive charge grenade"
@@ -198,6 +199,7 @@
 	fire_level = 45
 	burn_level = 45
 	fire_color = "blue"
+	overlay_type = "blue"
 
 /obj/item/explosive/grenade/sticky/trailblazer/phosphorus/activate(mob/user)
 	. = ..()
@@ -220,6 +222,7 @@
 	det_time = 5 SECONDS
 	light_impact_range = 1
 	self_sticky = TRUE
+	overlay_type = "green"
 	/// smoke type created when the grenade is primed
 	var/datum/effect_system/smoke_spread/smoketype = /datum/effect_system/smoke_spread/tactical
 	///radius this smoke grenade will encompass
@@ -260,6 +263,7 @@
 	det_time = 4 SECONDS
 	hud_state = "grenade_fire"
 	icon_state_mini = "grenade_orange"
+	overlay_type = "orange"
 
 /obj/item/explosive/grenade/incendiary/prime()
 	flame_radius(2, get_turf(src))
@@ -285,6 +289,7 @@
 	desc = "A reliable incendiary grenade utilised by SOM forces. Based off the S30 platform shared by most SOM grenades. Designed for hand or grenade launcher use."
 	icon_state = "grenade_fire_som"
 	item_state = "grenade_fire_som"
+	overlay_type = "orange"
 
 /obj/item/explosive/grenade/incendiary/molotov
 	name = "improvised firebomb"
@@ -322,7 +327,7 @@
 	weak_impact_range = 4
 	power = 80
 	falloff = 20
-
+	overlay_type = "yellow"
 
 /obj/item/explosive/grenade/smokebomb
 	name = "\improper M40 HSDP smoke grenade"
@@ -335,14 +340,14 @@
 	icon_state_mini = "grenade_blue"
 	arm_sound = 'sound/weapons/grenade/grenade_pinout4.ogg'
 	G_hit_sound = 'sound/weapons/grenade/grenade_hit4.ogg'
+	overlay_type = "white"
 	/// smoke type created when the grenade is primed
 	var/datum/effect_system/smoke_spread/smoketype = /datum/effect_system/smoke_spread/bad
 	///radius this smoke grenade will encompass
 	var/smokeradius = 7
 	///The duration of the smoke
 	var/smoke_duration = 11
 
-
 /obj/item/explosive/grenade/smokebomb/prime()
 	var/datum/effect_system/smoke_spread/smoke = new smoketype()
 	playsound(loc, 'sound/effects/smoke_bomb.ogg', 25, TRUE)
@@ -355,6 +360,7 @@
 	desc = "The S30-S is a small, but powerful smoke grenade. Based off the S30 platform shared by most SOM grenades. It is set to detonate in 2 seconds."
 	icon_state = "grenade_smoke_som"
 	item_state = "grenade_smoke_som"
+	overlay_type = "cyan"
 
 ///chemical grenades
 
@@ -369,6 +375,7 @@
 	dangerous = TRUE
 	smoketype = /datum/effect_system/smoke_spread/xeno/neuro/medium
 	smokeradius = 6
+	overlay_type = "orange"
 
 /obj/item/explosive/grenade/smokebomb/acid
 	name = "\improper M40-A Acid smoke grenade"
@@ -380,6 +387,7 @@
 	dangerous = TRUE
 	smoketype = /datum/effect_system/smoke_spread/xeno/acid
 	smokeradius = 5
+	overlay_type = "aqua"
 
 /obj/item/explosive/grenade/smokebomb/satrapine
 	name = "satrapine smoke grenade"
@@ -406,30 +414,34 @@
 	hud_state = "grenade_hide"
 	icon_state_mini = "grenade_green"
 	smoketype = /datum/effect_system/smoke_spread/tactical
+	overlay_type = "green"
 
 /obj/item/explosive/grenade/smokebomb/cloak/ags
 	name = "\improper AGLS-37 SCDP smoke grenade"
 	desc = "A small tiny smart grenade, it is about to blow up in your face, unless you found it inert. Otherwise a pretty normal grenade, other than it is somehow in a primeable state."
 	icon_state = "ags_cloak"
 	smokeradius = 4
+	overlay_type = "green"
 
 /obj/item/explosive/grenade/smokebomb/drain
 	name = "\improper M40-T smoke grenade"
 	desc = "The M40-T is a small, but powerful Tanglefoot grenade, designed to remove plasma with minimal side effects. Based off the same platform as the M40 HEDP. It is set to detonate in 6 seconds."
 	icon_state = "grenade_pgas"
 	item_state = "grenade_pgas"
 	hud_state = "grenade_drain"
+	dangerous = TRUE
 	det_time = 6 SECONDS
 	icon_state_mini = "grenade_purple"
-	dangerous = TRUE
 	smoketype = /datum/effect_system/smoke_spread/plasmaloss
+	overlay_type = "purple"
 
 /obj/item/explosive/grenade/smokebomb/drain/agls
 	name = "\improper AGLS-T smoke grenade"
 	desc = "A small tiny smart grenade, it is about to blow up in your face, unless you found it inert. Otherwise a pretty normal grenade, other than it is somehow in a primeable state."
 	icon_state = "ags_pgas"
 	det_time = 3 SECONDS
 	smokeradius = 4
+	overlay_type = "purple"
 
 /obj/item/explosive/grenade/phosphorus
 	name = "\improper M40 HPDP grenade"
@@ -484,6 +496,7 @@
 	light_impact_range = 3
 	power = 80
 	falloff = 30
+	overlay_type = "blue"
 
 /obj/item/explosive/grenade/impact/throw_impact(atom/hit_atom, speed)
 	. = ..()

diff --git a/code/modules/clothing/head/jobs.dm b/code/modules/clothing/head/jobs.dm
@@ -106,7 +106,7 @@
 	desc = "Someone who wears this will look very smart."
 	icon_state = "detective"
 	allowed = list(/obj/item/reagent_containers/food/snacks/candy_corn, /obj/item/tool/pen)
-	soft_armor = list(MELEE = 50, BULLET = 5, LASER = 25, ENERGY = 10, BOMB = 0, BIO = 0, FIRE = 10, ACID = 10)
+	soft_armor = list(MELEE = 15, BULLET = 15, LASER = 15, ENERGY = 15, BOMB = 10, BIO = 5, FIRE = 5, ACID = 5)
 	siemens_coefficient = 0.9
 	flags_armor_protection = NONE
 	species_exception = list(/datum/species/robot)

diff --git a/code/modules/clothing/modular_armor/attachments/arm_plates.dm b/code/modules/clothing/modular_armor/attachments/arm_plates.dm
@@ -11,8 +11,6 @@
 /obj/item/armor_module/armor/arms/marine
 	name = "\improper Jaeger Pattern Infantry arm plates"
 	desc = "Designed for use with the Jaeger Combat Exoskeleton. It provides protection and encumbrance when attached and is fairly easy to attach and remove from armor. Click on the armor frame to attach it. All arm plates have the same armor and slowdown, meaning that only changing the chestplate makes significant armor difference. This armor appears to be marked as a Infantry armor piece."
-	soft_armor = list(MELEE = 10, BULLET = 10, LASER = 10, ENERGY = 10, BOMB = 10, BIO = 10, FIRE = 10, ACID = 10)
-	slowdown = 0.1
 
 /obj/item/armor_module/armor/arms/marine/skirmisher
 	name = "\improper Jaeger Pattern Skirmisher arm plates"

diff --git a/code/modules/clothing/modular_armor/attachments/chest_plates.dm b/code/modules/clothing/modular_armor/attachments/chest_plates.dm
@@ -11,14 +11,14 @@
 /obj/item/armor_module/armor/chest/marine
 	name = "\improper Jaeger Pattern Medium Infantry chestplates"
 	desc = "Designed for use with the Jaeger Combat Exoskeleton. It provides moderate protection and encumbrance when attached and is fairly easy to attach and remove from armor. Click on the armor frame to attach it. This armor appears to be marked as a Infantry armor piece."
-	soft_armor = list(MELEE = 25, BULLET = 45, LASER = 45, ENERGY = 35, BOMB = 25, BIO = 30, FIRE = 30, ACID = 30)
-	slowdown = 0.3
+	soft_armor = list(MELEE = 45, BULLET = 60, LASER = 60, ENERGY = 40, BOMB = 40, BIO = 40, FIRE = 10, ACID = 45)
+	slowdown = SLOWDOWN_ARMOR_MEDIUM
 
 
 /obj/item/armor_module/armor/chest/marine/skirmisher
 	name = "\improper Jaeger Pattern Light Skirmisher chestplates"
 	desc = "Designed for use with the Jaeger Combat Exoskeleton. It provides minor protection and encumbrance when attached and is fairly easy to attach and remove from armor. Click on the armor frame to attach it. This armor appears to be marked as a Skirmisher armor piece."
-	soft_armor = list(MELEE = 15, BULLET = 35, LASER = 35, ENERGY = 25, BOMB = 20, BIO = 25, FIRE = 25, ACID = 25)
+	soft_armor = list(MELEE = 35, BULLET = 50, LASER = 50, ENERGY = 30, BOMB = 30, BIO = 30, FIRE = 5, ACID = 35)
 	slowdown = SLOWDOWN_ARMOR_VERY_LIGHT
 	greyscale_config = /datum/greyscale_config/armor_mk1/skirmisher
 
@@ -35,7 +35,7 @@
 /obj/item/armor_module/armor/chest/marine/assault
 	name = "\improper Jaeger Pattern Heavy Assault chestplates"
 	desc = "Designed for use with the Jaeger Combat Exoskeleton. It provides high protection and encumbrance when attached and is fairly easy to attach and remove from armor. Click on the armor frame to attach it. This armor appears to be marked as a Assault armor piece."
-	soft_armor = list(MELEE = 35, BULLET = 50, LASER = 50, ENERGY = 40, BOMB = 30, BIO = 30, FIRE = 30, ACID = 40)
+	soft_armor = list(MELEE = 55, BULLET = 70, LASER = 70, ENERGY = 50, BOMB = 50, BIO = 50, FIRE = 15, ACID = 55)
 	slowdown = SLOWDOWN_ARMOR_VERY_HEAVY
 	greyscale_config = /datum/greyscale_config/armor_mk1
 

diff --git a/code/modules/clothing/modular_armor/attachments/leg_plates.dm b/code/modules/clothing/modular_armor/attachments/leg_plates.dm
@@ -11,8 +11,6 @@
 /obj/item/armor_module/armor/legs/marine
 	name = "\improper Jaeger Pattern Infantry leg plates"
 	desc = "Designed for use with the Jaeger Combat Exoskeleton. It provides protection and encumbrance when attached and is fairly easy to attach and remove from armor. Click on the armor frame to attach it. All leg plates have the same armor and slowdown, meaning that only changing the chestplate makes significant armor difference. This armor appears to be marked as a Infantry armor piece."
-	soft_armor = list(MELEE = 10, BULLET = 10, LASER = 10, ENERGY = 10, BOMB = 10, BIO = 10, FIRE = 10, ACID = 10)
-	slowdown = 0.1
 
 /obj/item/armor_module/armor/legs/marine/skirmisher
 	name = "\improper Jaeger Pattern Skirmisher leg plates"

diff --git a/code/modules/clothing/modular_armor/combat_robot.dm b/code/modules/clothing/modular_armor/combat_robot.dm
@@ -7,7 +7,7 @@
 	icon_state = "chest"
 	item_state = "chest"
 	species_exception = list(/datum/species/robot)
-	soft_armor = list(MELEE = 45, BULLET = 65, LASER = 65, ENERGY = 55, BOMB = 45, BIO = 50, FIRE = 50, ACID = 55)
+	soft_armor = list(MELEE = 45, BULLET = 60, LASER = 60, ENERGY = 40, BOMB = 40, BIO = 40, FIRE = 10, ACID = 45)
 	slowdown = SLOWDOWN_ARMOR_MEDIUM
 
 	colorable_colors = ARMOR_PALETTES_LIST
@@ -51,14 +51,14 @@
 /obj/item/clothing/suit/modular/robot/light
 	name = "XR-1-L armor plating"
 	desc = "Light armor plating designed for self mounting on TerraGov combat robotics. It has self-sealing bolts for mounting on robotic owners inside."
-	soft_armor = list(MELEE = 35, BULLET = 55, LASER = 55, ENERGY = 50, BOMB = 40, BIO = 45, FIRE = 45, ACID = 45)
+	soft_armor = list(MELEE = 35, BULLET = 50, LASER = 50, ENERGY = 30, BOMB = 30, BIO = 30, FIRE = 5, ACID = 35)
 	slowdown = SLOWDOWN_ARMOR_VERY_LIGHT
 	greyscale_config = /datum/greyscale_config/robot/light
 
 /obj/item/clothing/suit/modular/robot/heavy
 	name = "XR-1-H armor plating"
 	desc = "Heavy armor plating designed for self mounting on TerraGov combat robotics. It has self-sealing bolts for mounting on robotic owners inside."
-	soft_armor = list(MELEE = 55, BULLET = 70, LASER = 70, ENERGY = 55, BOMB = 50, BIO = 50, FIRE = 50, ACID = 60)
+	soft_armor = list(MELEE = 55, BULLET = 70, LASER = 70, ENERGY = 50, BOMB = 50, BIO = 50, FIRE = 15, ACID = 55)
 	slowdown = SLOWDOWN_ARMOR_VERY_HEAVY
 	greyscale_config = /datum/greyscale_config/robot/heavy
 

diff --git a/code/modules/clothing/modular_armor/jaeger.dm b/code/modules/clothing/modular_armor/jaeger.dm
@@ -4,7 +4,7 @@
 /obj/item/clothing/suit/modular/jaeger
 	name = "\improper Jaeger Infantry medium exoskeleton"
 	desc = "A Infantry-pattern Jaeger combat exoskeleton made to work with modular attachments for the ability to function in many enviroments. This one seems to have a moderate amount of armor plating. Alt-Click to remove attached items. Use it to toggle the built-in flashlight."
-	soft_armor = list(MELEE = 45, BULLET = 65, LASER = 65, ENERGY = 55, BOMB = 45, BIO = 50, FIRE = 50, ACID = 50)
+	soft_armor = list(MELEE = 45, BULLET = 60, LASER = 60, ENERGY = 40, BOMB = 40, BIO = 40, FIRE = 10, ACID = 45)
 	icon_state = "chest"
 	item_state = "chest"
 	slowdown = SLOWDOWN_ARMOR_MEDIUM
@@ -71,7 +71,7 @@
 /obj/item/clothing/suit/modular/jaeger/light
 	name = "\improper Jaeger Scout light exoskeleton"
 	desc = "A Scout-pattern Jaeger combat exoskeleton made to work with modular attachments for the ability to function in many enviroments. This one seems to have a light amount of armor plating. Alt-Click to remove attached items. Use it to toggle the built-in flashlight."
-	soft_armor = list(MELEE = 35, BULLET = 55, LASER = 55, ENERGY = 50, BOMB = 40, BIO = 45, FIRE = 45, ACID = 45)
+	soft_armor = list(MELEE = 35, BULLET = 50, LASER = 50, ENERGY = 30, BOMB = 30, BIO = 30, FIRE = 5, ACID = 35)
 	slowdown = SLOWDOWN_ARMOR_VERY_LIGHT
 	greyscale_config = /datum/greyscale_config/armor_mk2/scout
 
@@ -89,7 +89,7 @@
 /obj/item/clothing/suit/modular/jaeger/heavy
 	name = "\improper Jaeger Gungnir heavy exoskeleton"
 	desc = "A Gungnir-pattern Jaeger combat exoskeleton made to work with modular attachments for the ability to function in many enviroments. This one seems to have a high amount of armor plating. Alt-Click to remove attached items. Use it to toggle the built-in flashlight."
-	soft_armor = list(MELEE = 55, BULLET = 70, LASER = 70, ENERGY = 60, BOMB = 50, BIO = 50, FIRE = 50, ACID = 60)
+	soft_armor = list(MELEE = 55, BULLET = 70, LASER = 70, ENERGY = 50, BOMB = 50, BIO = 50, FIRE = 15, ACID = 55)
 	slowdown = SLOWDOWN_ARMOR_VERY_HEAVY
 	greyscale_config = /datum/greyscale_config/armor_mk2/gugnir
 
@@ -114,8 +114,7 @@
 	icon_state = "helmet"
 	item_state = "helmet"
 	icon_override = null
-	soft_armor = list(MELEE = 45, BULLET = 65, LASER = 65, ENERGY = 55, BOMB = 45, BIO = 50, FIRE = 50, ACID = 50)
-
+	soft_armor = list(MELEE = 45, BULLET = 60, LASER = 60, ENERGY = 40, BOMB = 40, BIO = 40, FIRE = 10, ACID = 45)
 	greyscale_colors = ARMOR_PALETTE_DRAB
 	colorable_allowed = PRESET_COLORS_ALLOWED|HAIR_CONCEALING_CHANGE_ALLOWED
 	colorable_colors = ARMOR_PALETTES_LIST

diff --git a/code/modules/clothing/modular_armor/xenonauten.dm b/code/modules/clothing/modular_armor/xenonauten.dm
@@ -150,7 +150,6 @@
 /obj/item/clothing/head/modular/m10x
 	name = "\improper M10X pattern marine helmet"
 	desc = "A standard M10 Pattern Helmet with attach points. It reads on the label, 'The difference between an open-casket and closed-casket funeral. Wear on head for best results.'."
-
 	item_state_worn = TRUE
 	soft_armor = list(MELEE = 45, BULLET = 60, LASER = 60, ENERGY = 40, BOMB = 40, BIO = 40, FIRE = 10, ACID = 45)
 	attachments_allowed = list(

diff --git a/icons/effects/danger.dmi b/icons/effects/danger.dmi
diff --git a/icons/mob/inhands/equipment/surgery_left.dmi b/icons/mob/inhands/equipment/surgery_left.dmi
diff --git a/icons/mob/inhands/equipment/surgery_right.dmi b/icons/mob/inhands/equipment/surgery_right.dmi
diff --git a/icons/obj/items/grenade.dmi b/icons/obj/items/grenade.dmi
diff --git a/icons/obj/items/surgery_tools.dmi b/icons/obj/items/surgery_tools.dmi
diff --git a/icons/obj/structures/crates.dmi b/icons/obj/structures/crates.dmi