Goldman Gaslighting (#2490)

* Gaslighting? You're just crazy. * shawty shotty Adds short rev shotgun and gives to keeper * wide choke! --------- Co-authored-by: Professor Popoff <[email protected]>
Mojave-Sun · Feb 4, 2024 · 75ed141 · 75ed141
1 parent 80a8a73
commit 75ed141
Show file tree

Hide file tree

Showing 11 changed files with 37 additions and 18 deletions.
diff --git a/code/modules/projectiles/gun.dm b/code/modules/projectiles/gun.dm
@@ -3,6 +3,7 @@
 #define FIRING_PIN_REMOVAL_DELAY 50
 
 //MS13 EDIT BEGIN
+#define CHOKE_LOOSE -15
 #define CHOKE_WIDE 0
 #define CHOKE_MODERATE 7
 #define CHOKE_TIGHT 11

diff --git a/mojave/code/modules/jobs/job_types/goldman/goldman.dm b/mojave/code/modules/jobs/job_types/goldman/goldman.dm
@@ -15,26 +15,26 @@
 	id =		 /obj/item/card/id/ms13/goldman
 	head = 		 /obj/item/clothing/head/helmet/ms13/cowboy/goldman
 	uniform =	 /obj/item/clothing/under/ms13/goldman
-	belt =		 /obj/item/gun/ballistic/revolver/ms13/rev357
+	belt =		 /obj/item/gun/ballistic/revolver/ms13/rev10mm
 	r_pocket = 	 /obj/item/stack/ms13/currency/cap/thirtyfive
 	l_pocket = 	 /obj/item/flashlight/flare/ms13
 	shoes =		 /obj/item/clothing/shoes/ms13/explorer
 	gloves =	 /obj/item/clothing/gloves/ms13/leather
 	mask =		 /obj/item/clothing/mask/ms13/bandana/goldman/alt
 	backpack_contents = list(
 		/obj/item/stack/medical/gauze/ms13/three=1,\
-		/obj/item/hatchet/ms13/tomahawk=1,\
-		/obj/item/ammo_box/ms13/a357box=1)
+		/obj/item/knife/ms13/hunting=1,\
+		/obj/item/ammo_box/ms13/c10mm=1)
 
 /datum/outfit/job/ms13/goldman/standard/pre_equip(mob/living/carbon/human/H)
 	..()
 
 	suit = pick(/obj/item/clothing/suit/ms13/goldman/duster_covered,\
 		/obj/item/clothing/suit/ms13/goldman/duster_reinf)
 
-	suit_store = pick(/obj/item/gun/ballistic/shotgun/ms13/lever/trail,\
-		/obj/item/gun/ballistic/revolver/ms13/mts,\
-		/obj/item/gun/ballistic/rifle/ms13/hunting)
+	suit_store = pick(/obj/item/gun/ballistic/shotgun/ms13/lever/cowboy,\
+		/obj/item/gun/ballistic/revolver/ms13/caravan,\
+		/obj/item/gun/ballistic/rifle/ms13/hunting/surplus)
 
 	if(prob(40))
 		glasses = /obj/item/clothing/glasses/ms13/leather/goldman

diff --git a/mojave/code/modules/jobs/job_types/goldman/keeper.dm b/mojave/code/modules/jobs/job_types/goldman/keeper.dm
@@ -22,7 +22,7 @@
 	r_pocket = 	 /obj/item/radio/ms13/broadcast
 	l_pocket = 	 /obj/item/flashlight/ms13
 	shoes =		 /obj/item/clothing/shoes/ms13/fancy
-	suit_store = /obj/item/gun/ballistic/shotgun/ms13/lever
+	suit_store = /obj/item/gun/ballistic/revolver/ms13/mts/shorty
 	back =		 /obj/item/storage/ms13/satchel
 	backpack_contents = list(
 		/obj/item/stack/medical/gauze/ms13/half=1,\

diff --git a/mojave/code/modules/jobs/job_types/goldman/roadrunner.dm b/mojave/code/modules/jobs/job_types/goldman/roadrunner.dm
@@ -1,7 +1,7 @@
 /datum/job/ms13/goldman/roadrunner
 	title = "Goldman Road Runner"
-	total_positions = 3
-	spawn_positions = 3
+	total_positions = 2
+	spawn_positions = 2
 	supervisors = "The Ringleader and the Keeper."
 	description = "Stay in line and listen to your superiors. Ensure messages are delivered as needed and the nearby region is well travelled and scouted. Abide by established agreements and patrol the highways."
 
@@ -23,13 +23,13 @@
 	gloves =	 /obj/item/clothing/gloves/ms13/fingerless
 	glasses = 	 /obj/item/clothing/glasses/ms13/leather/goldman
 	mask =		 /obj/item/clothing/mask/ms13/facewrap/goldman
-	suit_store = /obj/item/gun/ballistic/revolver/ms13/derringer
+	suit_store = /obj/item/gun/ballistic/automatic/ms13/full/smg9mm
 	back =		 /obj/item/storage/ms13/satchel
 	backpack_contents = list(
 		/obj/item/stack/medical/gauze/ms13/half=1,\
 		/obj/item/stack/medical/ms13/healing_powder=1,\
 		/obj/item/stack/medical/splint/ms13/wooden=1,\
-		/obj/item/gun/ballistic/automatic/ms13/full/smg9mm=1,\
+		/obj/item/gun/ballistic/revolver/ms13/rev357/police=1,\
 		/obj/item/ammo_box/magazine/ms13/smgm9mm=1, \
 		/obj/item/stack/ms13/currency/cap/sixty=1)
 

diff --git a/mojave/code/modules/jobs/job_types/goldman/unproven.dm b/mojave/code/modules/jobs/job_types/goldman/unproven.dm
@@ -1,7 +1,7 @@
 /datum/job/ms13/goldman/unproven
 	title = "Goldman Unproven"
-	total_positions = 4
-	spawn_positions = 4
+	total_positions = 3
+	spawn_positions = 3
 	supervisors = "Proper Goldman, the Ringleader and the Kepper."
 	description = "Stay in line and listen to your superiors. Prove yourself to the goldman. Make yourself useful to the group. Make a name for yourself, somewhat literally."
 
@@ -14,7 +14,7 @@
 	jobtype = 	 /datum/job/ms13/goldman/unproven
 	head = 		 /obj/item/clothing/head/helmet/ms13/cowboy/goldman
 	uniform =	 /obj/item/clothing/under/ms13/goldman/unproven
-	belt =		 /obj/item/claymore/ms13/pipe/tireiron
+	belt =		 /obj/item/hatchet/ms13/tomahawk
 	r_pocket = 	 /obj/item/stack/ms13/currency/cap/fifteen
 	shoes =		 /obj/item/clothing/shoes/ms13/brownie
 	backpack_contents = list(
@@ -26,9 +26,9 @@
 	suit = pick(/obj/item/clothing/suit/ms13/goldman/poncho,\
 		/obj/item/clothing/suit/ms13/goldman/duster)
 
-	suit_store = pick(/obj/item/gun/ballistic/automatic/pistol/ms13/m10mm,\
-		/obj/item/gun/ballistic/shotgun/ms13/lever/cowboy,\
-		/obj/item/gun/ballistic/revolver/ms13/rev357/police)
+	suit_store = pick(/obj/item/gun/ballistic/revolver/ms13/derringer,\
+		/obj/item/gun/ballistic/revolver/ms13/single,\
+		/obj/item/gun/ballistic/rifle/ms13/varmint)
 
 /datum/outfit/job/ms13/goldman/unproven/post_equip(mob/living/carbon/human/H, visualsOnly)
 	. = ..()

diff --git a/mojave/icons/mob/inhands/weapons/guns_inhand_left.dmi b/mojave/icons/mob/inhands/weapons/guns_inhand_left.dmi
diff --git a/mojave/icons/mob/inhands/weapons/guns_inhand_right.dmi b/mojave/icons/mob/inhands/weapons/guns_inhand_right.dmi
diff --git a/mojave/icons/mob/worn_guns.dmi b/mojave/icons/mob/worn_guns.dmi
diff --git a/mojave/icons/objects/guns/guns_inventory.dmi b/mojave/icons/objects/guns/guns_inventory.dmi
diff --git a/mojave/icons/objects/guns/guns_world.dmi b/mojave/icons/objects/guns/guns_world.dmi
diff --git a/mojave/items/guns/weapons/ballistic/revolver.dm b/mojave/items/guns/weapons/ballistic/revolver.dm
@@ -31,7 +31,7 @@
 	inhand_icon_state = "sawedoff"
 	force = 15
 	subtractible_armour_penetration = 0
-	spread_reduction = CHOKE_WIDE
+	spread_reduction = CHOKE_LOOSE
 	fire_delay = 0.5 SECONDS
 	slot_flags = ITEM_SLOT_SUITSTORE | ITEM_SLOT_BELT
 	slowdown = 0.5
@@ -89,6 +89,24 @@
 	grid_height = 64
 	wield_info = /datum/wield_info/default/inhands
 
+/obj/item/gun/ballistic/revolver/ms13/mts/shorty
+	name = "short revolver shotgun"
+	desc = "A cut down revolving shotgun. The stock is still intact, keep it that way. Half the barrel, half the accuracy- yet twice the fun."
+	icon_state = "revrifle_shorty"
+	inhand_icon_state = "revrifle_shorty"
+	w_class = WEIGHT_CLASS_BULKY
+	weapon_weight = WEAPON_HEAVY
+	slot_flags = ITEM_SLOT_BACK
+	mag_type = /obj/item/ammo_box/magazine/internal/cylinder/ms13/mts
+	force = 25
+	subtractible_armour_penetration = 5
+	fire_delay = 0.55 SECONDS
+	recoil = 1.8
+	spread_reduction = CHOKE_LOOSE
+	slowdown = 0.6
+	grid_width = 128
+	grid_height = 64
+
 ////////////////////////// revolvers////////////////
 /obj/item/gun/ballistic/revolver/ms13/derringer
 	name = "derringer"