Merge pull request #3259 from RinPin/rin's-snowflake-stuff

Snowflake loadout stuff + Hell Nomad radio fix (100% real no fake)

code/datums/components/crafting/recipes/recipes_weapon_and_ammo.dm

@@ -1384,6 +1384,19 @@
 	subcategory = CAT_WEAPON
 	always_available = FALSE
 
+/datum/crafting_recipe/smg10mm/magnetic
+	name = "10mm Magnetic Pistol"
+	result = /obj/item/gun/ballistic/automatic/smg/smg10mm/magnetic
+	reqs = list(/obj/item/gun/ballistic/automatic/smg/smg10mm = 1,
+				/obj/item/stack/crafting/electronicparts = 1
+				)
+	tools = list(TOOL_WORKBENCH)
+	time = 120
+	category = CAT_WEAPONRY
+	subcategory = CAT_WEAPON
+	always_available = FALSE
+
+
 //grease gun
 /datum/crafting_recipe/grease_gun
 	name = "m3a1 grease gun"

code/game/objects/items/devices/radio/encryptionkey.dm

@@ -248,7 +248,7 @@
 	name = "Hell's Nomads radio encryption key"
 	desc = "An encryption key for a radio headset.  To access the Hell's Nomads channel, use :b, to access Ashdown's channel, use :d"
 	icon_state = "cypherkey"
-	channels = list(RADIO_CHANNEL_BIKER = 1, RADIO_CHANNEL_ASHDOWN = 1 )
+	channels = list(RADIO_CHANNEL_ASHDOWN = 1, RADIO_CHANNEL_BIKER = 1)
 
 /obj/item/encryptionkey/headset_responders
 	name = "Makeshift radio key"

code/game/objects/items/granters.dm

@@ -755,6 +755,11 @@
 	icon_state = "blueprint2"
 	crafting_recipe_types = list(/datum/crafting_recipe/smg10mm)
 
+/obj/item/book/granter/crafting_recipe/blueprint/smg10mm/magnetic
+	name = "10mm magnetic blueprint"
+	icon_state = "blueprint2"
+	crafting_recipe_types = list(/datum/crafting_recipe/smg10mm/magnetic)
+
 /obj/item/book/granter/crafting_recipe/blueprint/greasegun
 	name = "m3a1 grease gun blueprint"
 	icon_state = "blueprint2"

code/game/objects/items/melee/f13onehanded.dm

@@ -938,6 +938,18 @@ obj/item/melee/unarmed/punchdagger/cyborg
 	slot_flags = INV_SLOTBIT_BELT | INV_SLOTBIT_GLOVES
 	armor = ARMOR_VALUE_GENERIC_ITEM
 
+
+/obj/item/melee/unarmed/powerfist/refurbished
+	name = "HERAKLES power gauntlet "
+	desc = "A massive, experimental metal gauntlet restored with subpar components and suboptimal engineering skills, it's unlikely that it will hurt as much as a proper power fist, but it's still pretty hefty."
+	icon = 'icons/fallout/objects/melee/melee.dmi'
+	lefthand_file = 'icons/fallout/onmob/weapons/melee1h_lefthand.dmi'
+	righthand_file = 'icons/fallout/onmob/weapons/melee1h_righthand.dmi'
+	icon_state = "goliath"
+	item_state = "goliath"
+	force = 26 //snowflake round start weapon that is meant to just be a reskinned brass knuckles
+	throw_distance = 0
+
 ///////////
 // TOOLS //
 ///////////		-generally max 24 damage

code/modules/projectiles/guns/ballistic/automatic.dm

@@ -316,6 +316,60 @@
 	suppressor_y_offset = 16
 	fire_sound = 'sound/f13weapons/10mm_fire_03.ogg'
 
+
+
+/* * * * * * * * * * *
+ * 10mm Magnetic
+ * Baseline 10mm SMG (cosmetic only)
+ * 10mm
+ * Slower firing
+ * Heavier recoil
+ * One-handed
+ * No akimbo
+ * Snowflake rarity
+ * * * * * * * * * * */
+/obj/item/gun/ballistic/automatic/smg/smg10mm/magnetic
+	name = "Chiron Ferromagnetic Pistol"
+	desc = "a damaged, juryrigged machine pistol prototype utilizing maglev technologies to propel a ferromagnetic slug to extreme velocities."
+	icon = 'icons/fallout/objects/guns/ballistic.dmi'
+	icon_state = "magmp"
+	item_state = "solarscorcher"
+	lefthand_file = 'icons/fallout/onmob/weapons/guns_lefthand.dmi'
+	righthand_file = 'icons/fallout/onmob/weapons/guns_righthand.dmi'
+	mag_type = /obj/item/ammo_box/magazine/m10mm
+	init_mag_type = /obj/item/ammo_box/magazine/m10mm/adv/ext
+	weapon_class = WEAPON_CLASS_CARBINE
+	weapon_weight = GUN_ONE_HAND_ONLY
+	damage_multiplier = GUN_EXTRA_DAMAGE_0
+	init_recoil = SMG_RECOIL(1, 1)
+	init_firemodes = list(
+		/datum/firemode/automatic/rpm200,
+		/datum/firemode/semi_auto/faster
+	)
+	fire_sound = 'sound/weapons/magpistol.ogg'
+	can_scope = FALSE
+	casing_ejector = TRUE
+	can_flashlight = TRUE
+	scope_state = "flight"
+	flight_x_offset = 24
+	flight_y_offset = 16
+	weapon_special_component = null
+
+/obj/item/gun/ballistic/automatic/smg/smg10mm/magnetic/post_modify_projectile(obj/item/projectile/BB) //thurr. I turned a regular bullet into a mag bullet.
+	BB.name = "ferromagnetic bullet"
+	BB.icon = 'icons/obj/projectiles.dmi'
+	BB.icon_state = "magjectile"
+	BB.pass_flags = PASSTABLE
+	BB.light_range = 5
+	BB.damage_type = BRUTE
+	BB.flag = "bullet"
+	BB.impact_effect_type = /obj/effect/temp_visual/impact_effect/red_laser
+	BB.light_color = LIGHT_COLOR_RED
+	BB.is_reflectable = TRUE
+	BB.hitsound = 'sound/weapons/elecfire.ogg'
+	BB.hitsound_wall = 'sound/weapons/effects/searwall.ogg'
+
+
 /* * * * * * * * * * *
  * Worn 10mm SMG
  * Poor Baseline 10mm SMG

code/modules/projectiles/guns/ballistic/rifle.dm

@@ -659,7 +659,7 @@
 
 
 /obj/item/gun/ballistic/rifle/magnetic
-	name = "Hephestus Ferromagnetic Rifle"
+	name = "Hephaestus Ferromagnetic Rifle"
 	desc = "a damaged, juryrigged prototype utilizing maglev technologies to propel a ferromagnetic slug to extreme velocities."
 	icon = 'icons/fallout/objects/guns/ballistic.dmi'
 	icon_state = "magriflev"

modular_citadel/code/modules/client/loadout/__donator.dm

@@ -167,14 +167,24 @@
 	new /obj/item/gun/ballistic/automatic/aksmol/aldric(src)
 
 /datum/gear/donator/kits/rinpin
-	name = "Lee's stash"
+	name = "Lee's stash (rifle)"
 	path = /obj/item/storage/box/large/custom_kit/rinpin
 	ckeywhitelist = list("Pootismaniac")
 
 /obj/item/storage/box/large/custom_kit/rinpin/PopulateContents()
 	new /obj/item/clothing/head/helmet/f13/metalmask/custom(src)
 	new /obj/item/gun/ballistic/rifle/magnetic(src)
 
+/datum/gear/donator/kits/rinpin2
+	name = "Lee's stash (SMG,Punch)"
+	path = /obj/item/storage/box/large/custom_kit/rinpin2
+	ckeywhitelist = list("Pootismaniac")
+
+/obj/item/storage/box/large/custom_kit/rinpin2/PopulateContents()
+	new /obj/item/clothing/head/helmet/f13/metalmask/custom(src)
+	new /obj/item/book/granter/crafting_recipe/blueprint/smg10mm/magnetic(src)
+	new /obj/item/melee/unarmed/powerfist/refurbished(src)
+
 /datum/gear/donator/kits/archyzt
 	name = "Follower's Traveler"
 	path = /obj/item/storage/box/large/custom_kit/archyzt