Merge pull request #2639 from jinxynii/master

Loadouts, new gun, and animated pool icon
ARF-SS13 · Jul 15, 2023 · ea8538b · ea8538b
2 parents 3ecbbc3 + 4225387
commit ea8538b
Show file tree

Hide file tree

Showing 9 changed files with 61 additions and 1 deletion.
diff --git a/code/modules/clothing/suits/arfsuits.dm b/code/modules/clothing/suits/arfsuits.dm
@@ -2959,6 +2959,8 @@
 
 /obj/item/clothing/suit/armor/heavy/riot/retrofitted/worn
 	name = "retrofit worn riot combat armor"
+	icon_state = "foxranger"
+	item_state = "foxranger"
 	desc = "A suit of pre-war combat armor redesigned to handle riots. This one looks worn down, and has had its heavier components stripped away."
 	armor_tokens = list(ARMOR_MODIFIER_UP_MELEE_T1, ARMOR_MODIFIER_UP_BULLET_T1, ARMOR_MODIFIER_UP_DT_T2, ARMOR_MODIFIER_DOWN_LASER_T1)
 	slowdown = ARMOR_SLOWDOWN_LIGHT * ARMOR_SLOWDOWN_GLOBAL_MULT

diff --git a/code/modules/projectiles/ammunition/energy/plasma.dm b/code/modules/projectiles/ammunition/energy/plasma.dm
@@ -73,6 +73,16 @@
 	fire_sound = 'sound/f13weapons/AlienBlasterFire.ogg'
 	e_cost = 1000 //four shots and you're out. use them wisely.
 
+/obj/item/ammo_casing/energy/plasma/pistol/eve/caster
+	projectile_type = /obj/item/projectile/f13plasma/pistol/eve/worn
+	fire_sound = 'sound/f13weapons/plasma_pistol.ogg'
+	e_cost = 25 //should be 5 shots of a stream of 5.
+
+/obj/item/ammo_casing/energy/plasma/pistol/caster
+	projectile_type = /obj/item/projectile/f13plasma/pistol
+	fire_sound = 'sound/f13weapons/plasma_pistol.ogg'
+	e_cost = 12.5 //should be double of the eve caster
+
 /obj/item/ammo_casing/energy/plasma/miner
 	projectile_type = /obj/item/projectile/f13plasma/repeater/mining
 	select_name = "mining plasma stream"

diff --git a/code/modules/projectiles/guns/energy/plasmaf13.dm b/code/modules/projectiles/guns/energy/plasmaf13.dm
@@ -159,6 +159,42 @@
 	)
 	init_recoil = SHOTGUN_RECOIL(1, 1)
 
+//Eve Caster
+/obj/item/gun/energy/laser/plasma/castereve
+	name ="Eve 3.0"
+	icon = 'icons/fallout/objects/guns/longenergy.dmi'
+	item_state = "Aldric-Plasma-CasterEve"
+	icon_state = "Aldric-Plasma-CasterEve"
+	desc = "A burst-fire energy weapon that fires a torrential stream of toroidal plasma towards an unlucky target. This ones glows purple and has the words; Pick a god and pray. etched into the side."
+	ammo_type = list(/obj/item/ammo_casing/energy/plasma/pistol/eve/caster)
+	cell_type = /obj/item/stock_parts/cell/ammo/mfc
+	can_scope = FALSE
+	equipsound = 'sound/f13weapons/equipsounds/plasequip.ogg'
+	weapon_class = WEAPON_CLASS_CARBINE
+	weapon_weight = GUN_TWO_HAND_ONLY
+	init_firemodes = list(
+		/datum/firemode/burst/five
+	)
+	init_recoil = AUTOCARBINE_RECOIL(1, 1)
+
+//Normal Plasma Caster
+/obj/item/gun/energy/laser/plasma/caster
+	name ="Plasma Caster"
+	icon = 'icons/fallout/objects/guns/longenergy.dmi'
+	item_state = "Aldric-Plasma-Caster"
+	icon_state = "Aldric-Plasma-Caster"
+	desc = "A burst-fire energy weapon that fires a torrential stream of toroidal plasma towards an unfortunate soul."
+	ammo_type = list(/obj/item/ammo_casing/energy/plasma/pistol/caster)
+	cell_type = /obj/item/stock_parts/cell/ammo/mfc
+	can_scope = FALSE
+	equipsound = 'sound/f13weapons/equipsounds/plasequip.ogg'
+	weapon_class = WEAPON_CLASS_CARBINE
+	weapon_weight = GUN_TWO_HAND_ONLY
+	init_firemodes = list(
+		/datum/firemode/burst/five
+	)
+	init_recoil = AUTOCARBINE_RECOIL(1, 1)
+
 /obj/item/gun/energy/laser/plasma/spear
 	name = "ergonomic plasmacaster"
 	icon = 'icons/fallout/objects/melee/twohanded.dmi'

diff --git a/code/modules/smithing/finished_items.dm b/code/modules/smithing/finished_items.dm
@@ -82,6 +82,9 @@
 //	qualitymod = 1
 	custom_materials = list(/datum/material/iron = 1000)
 
+/obj/item/melee/smith/hammer/premadeadam
+	custom_materials = list(/datum/material/adamantine = 1000)
+
 // The true manual mining scanner, knock it on rock to scan. Could use a cooldown, can't be bothered to sort it. Lowest quality got too short range to test out.
 /obj/item/mining_scanner/prospector
 	name = "prospectors pick"

diff --git a/icons/fallout/objects/guns/longenergy.dmi b/icons/fallout/objects/guns/longenergy.dmi
diff --git a/icons/fallout/onmob/weapons/guns_lefthand.dmi b/icons/fallout/onmob/weapons/guns_lefthand.dmi
diff --git a/icons/fallout/onmob/weapons/guns_righthand.dmi b/icons/fallout/onmob/weapons/guns_righthand.dmi
diff --git a/icons/turf/pool.dmi b/icons/turf/pool.dmi
diff --git a/modular_citadel/code/modules/client/loadout/__donator.dm b/modular_citadel/code/modules/client/loadout/__donator.dm
@@ -156,7 +156,7 @@
 	new /obj/item/clothing/suit/armor/heavy/riot/retrofitted/worn(src)
 	new /obj/item/melee/transforming/plasmacutter/regular/eve(src)
 	new /obj/item/clothing/glasses/welding(src)
-	new /obj/item/book/granter/crafting_recipe/blueprint/plasmarifle(src)
+	new /obj/item/gun/energy/laser/plasma/castereve(src)
 
 /datum/gear/donator/kits/archyzt
 	name = "Follower's Traveler"
@@ -428,6 +428,15 @@
 	new /obj/item/smelling_salts(src)
 	new /obj/item/circuitboard/machine/chem_dispenser(src)
 
+/datum/gear/donator/kits/Escamado
+	name = "Blacksmith's Kit"
+	path = /obj/item/storage/box/large/custom_kit/Escamado
+	ckeywhitelist = list("Escamado")
+
+/obj/item/storage/box/large/custom_kit/Escamado/PopulateContents()
+	new /obj/item/survivalcapsule/blacksmith(src)
+	new /obj/item/melee/smith/hammer/premadeadam(src)
+
 // F
 
 /datum/gear/donator/kits/ferisramsay