various final day tweaks (#98)

Co-authored-by: grade9fixer <[email protected]>
Foundation-19 · Apr 19, 2024 · 42efba8 · 42efba8
1 parent cf29e97
commit 42efba8
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 15 deletions.
diff --git a/code/game/objects/effects/spawners/f13lootdrop.dm b/code/game/objects/effects/spawners/f13lootdrop.dm
@@ -947,7 +947,8 @@
 				/obj/item/gun/ballistic/revolver/colt357/lucky,
 				/obj/item/gun/ballistic/automatic/m1garand/oldglory,
 				/obj/item/gun/ballistic/automatic/pistol/pistol14/lildevil,
-				/obj/item/gun/ballistic/shotgun/automatic/combat/neostead
+				/obj/item/gun/ballistic/shotgun/automatic/combat/neostead,
+				/obj/item/gun/ballistic/revolver/ghoulgun
 				)
 
 

diff --git a/code/game/objects/items/loadout_beacons.dm b/code/game/objects/items/loadout_beacons.dm
@@ -1274,14 +1274,6 @@ GLOBAL_LIST_EMPTY(loadout_boxes)
 
 /// ENERGY!
 
-/obj/item/storage/box/gun/energy
-	name = "compact rcw case"
-	w_class = WEIGHT_CLASS_NORMAL //no roundstart laser rifles rn
-
-/obj/item/storage/box/gun/energy/PopulateContents()
-	new /obj/item/gun/energy/laser/auto/worn(src)
-	new /obj/item/stock_parts/cell/ammo/ecp(src)
-
 /obj/item/storage/box/gun/energy/plasma
 	name = "plasma pistol case"
 
@@ -1366,12 +1358,6 @@ GLOBAL_LIST_EMPTY(loadout_boxes)
 	entry_class = LOADOUT_CAT_ENERGY
 	spawn_thing = /obj/item/storage/box/gun/energy/stun
 
-/datum/loadout_box/compact_rcw
-	entry_tag = "Compact RCW"
-	entry_flags = LOADOUT_FLAG_WASTER
-	entry_class = LOADOUT_CAT_ENERGY
-	spawn_thing = /obj/item/storage/box/gun/energy/compact_rcw
-
 /datum/loadout_box/wattz1000
 	entry_tag = "Wattz 1000"
 	entry_flags = LOADOUT_FLAG_WASTER

diff --git a/code/modules/projectiles/boxes_magazines/internal/revolver.dm b/code/modules/projectiles/boxes_magazines/internal/revolver.dm
@@ -162,3 +162,9 @@
 	ammo_type = /obj/item/ammo_casing/a3006
 	caliber = list(CALIBER_3006)
 	max_ammo = 1
+
+/obj/item/ammo_box/magazine/internal/cylinder/ghoulgun
+	name = "rusted revolver cylinder"
+	ammo_type = /obj/item/ammo_casing/shotgun
+	caliber = list(CALIBER_SHOTGUN)
+	max_ammo = 5
diff --git a/code/modules/projectiles/guns/ballistic/revolver.dm b/code/modules/projectiles/guns/ballistic/revolver.dm
@@ -656,6 +656,28 @@
 	)
 	fire_sound = 'sound/weapons/gunshot_silenced.ogg'
 
+/* * * * * * * * * * *
+ * Rusted Revolver
+ * High damage revolver that uses shotgun shells
+ * Uses shotgun shells
+ * Unique
+ * Based off of the Ghoul's revolver from the Fallout show
+ * * * * * * * * * * */
+
+/obj/item/gun/ballistic/revolver/ghoulgun
+	name = "rusted revolver"
+	desc = "A worn but well-maintained revolver. Uses shotgun rounds, with a heavy barrel for greater velocity."
+	icon_state = "ghoulgun"
+	mag_type = /obj/item/ammo_box/magazine/internal/cylinder/ghoulgun
+	weapon_class = WEAPON_CLASS_SMALL
+	weapon_weight = GUN_ONE_HAND_AKIMBO
+	damage_multiplier = GUN_EXTRA_DAMAGE_T2
+	gun_accuracy_zone_type = ZONE_WEIGHT_AUTOMATIC
+	init_firemodes = list(
+		/datum/firemode/semi_auto/fast
+	)
+	fire_sound = 'sound/f13weapons/ghoulgun_fire.ogg'
+
 // LEGACY STUFF
 
 // A gun to play Russian Roulette!

diff --git a/icons/fallout/objects/guns/ballistic.dmi b/icons/fallout/objects/guns/ballistic.dmi
diff --git a/sound/f13weapons/ghoulgun_fire.ogg b/sound/f13weapons/ghoulgun_fire.ogg