Skip to content

Commit

Permalink
Gladstone (#4799)
Browse files Browse the repository at this point in the history
* Add/include gladstone.dm

* Gladstone re-added
  • Loading branch information
Rat-Time authored Oct 12, 2023
1 parent f768307 commit 482a0da
Show file tree
Hide file tree
Showing 8 changed files with 100 additions and 0 deletions.
4 changes: 4 additions & 0 deletions code/datums/autolathe/guns.dm
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,10 @@
name = "OT SG \"Regulator\""
build_path = /obj/item/gun/projectile/shotgun/pump/combat

/datum/design/autolathe/gun/gladstone
name = "H&S SG \"Gladstone\""
build_path = /obj/item/gun/projectile/shotgun/pump/gladstone

/datum/design/autolathe/gun/pug
name = "SA SG \"Pug\""
build_path = /obj/item/gun/projectile/shotgun/pug
Expand Down
2 changes: 2 additions & 0 deletions code/game/machinery/vendor/weapon_vendors.dm
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@
/obj/item/gun/projectile/automatic/greasegun = 2,
//Shotgun
/obj/item/gun/projectile/boltgun/lever = 2,
/obj/item/gun/projectile/shotgun/pump/gladstone = 2,
/obj/item/gun/projectile/shotgun/pump/china = 2,
//Ammo
/obj/item/ammo_magazine/speed_loader_pistol_35/rubber = 3,
Expand Down Expand Up @@ -110,6 +111,7 @@
/obj/item/gun/projectile/automatic/greasegun = 800,
//Shotgun
/obj/item/gun/projectile/boltgun/lever = 650,
/obj/item/gun/projectile/shotgun/pump/gladstone = 850,
/obj/item/gun/projectile/shotgun/pump/china = 1750,
//Ammo
/obj/item/ammo_magazine/speed_loader_pistol_35/rubber = 20,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -411,6 +411,18 @@
/datum/design/autolathe/ammo/sbaw_empty = 0, //So we can handload new mags
)

/obj/item/computer_hardware/hard_drive/portable/design/guns/gladstone
disk_name = "H&S - 20mm Gladstone Shotgun"
icon_state = "frozenstar"

license = 8
designs = list(
/datum/design/autolathe/gun/gladstone = 3,
/datum/design/autolathe/ammo/shotgun_beanbag,
/datum/design/autolathe/ammo/shotgun_blanks = 0,
/datum/design/autolathe/ammo/shotgun_illumination,
)

/obj/item/computer_hardware/hard_drive/portable/design/guns/state
disk_name = "Seinemetall Defense GmbH - 20mm State Auto Shotgun"
desc = "Known as the state, an odd shotgun, often redesigned every few years in a way few people are fully happy with."
Expand Down
5 changes: 5 additions & 0 deletions code/game/objects/random/guns.dm
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@
return pickweight(list(/obj/item/part/gun/frame/grizzly = 0.5,
/obj/item/part/gun/frame/sixshot = 0.5,
/obj/item/part/gun/frame/regulator = 0.5,
/obj/item/part/gun/frame/gladstone = 0.5,
/obj/item/part/gun/frame/grease = 0.5,
/obj/item/part/gun/frame/basilisk = 0.5,
/obj/item/part/gun/frame/sts = 0.5,
Expand All @@ -77,6 +78,7 @@
/obj/item/gun/projectile/revolver/sixshot = 1,\
/obj/item/gun/projectile/boltgun/lever = 1.5,\
/obj/item/gun/projectile/automatic/greasegun = 0.1,\
/obj/item/gun/projectile/shotgun/pump/gladstone = 0.5,\
/obj/item/gun/projectile/colt = 2,\
/obj/item/gun/projectile/revolver = 2,\
/obj/item/gun/projectile/boltgun = 0.5,\
Expand All @@ -101,6 +103,7 @@
/obj/item/part/gun/frame/makarov = 0.5,
/obj/item/part/gun/frame/hornet = 0.5,
/obj/item/part/gun/frame/regulator = 0.5,
/obj/item/part/gun/frame/gladstone = 0.5,
/obj/item/part/gun/frame/pug = 0.5,
/obj/item/part/gun/frame/saiga = 0.5,
/obj/item/part/gun/frame/strelki = 0.5,
Expand Down Expand Up @@ -226,6 +229,7 @@
return pickweight(list(/obj/item/part/gun/frame/sixshot = 0.5,
/obj/item/part/gun/frame/grizzly = 0.5,
/obj/item/part/gun/frame/regulator = 0.5,
/obj/item/part/gun/frame/gladstone = 0.5,
/obj/item/part/gun/frame/bull = 0.5,
/obj/item/part/gun/frame/pug = 0.5,

Expand All @@ -235,6 +239,7 @@
/obj/item/gun/projectile/shotgun/bull = 0.3,\
/obj/item/gun/projectile/shotgun/doublebarrel/sawn = 2,\
/obj/item/gun/projectile/shotgun/pump/combat/sawn = 1,\
/obj/item/gun/projectile/shotgun/pump/gladstone/sawn = 1,\
/obj/item/gun/projectile/shotgun/pug = 0.3,\
/obj/item/gun/projectile/revolver/sixshot = 0.7))

Expand Down
1 change: 1 addition & 0 deletions code/game/objects/random/lathe_disks/guns.dm
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,7 @@
/obj/item/computer_hardware/hard_drive/portable/design/guns/doublebarrel = 5,
/obj/item/computer_hardware/hard_drive/portable/design/guns/grizzly = 7,
/obj/item/computer_hardware/hard_drive/portable/design/guns/regulator = 4,
/obj/item/computer_hardware/hard_drive/portable/design/guns/gladstone = 5,
/obj/item/computer_hardware/hard_drive/portable/design/guns/lemant = 2, //Has a built in shotgun, so low odds but still here
/obj/item/computer_hardware/hard_drive/portable/design/guns/state = 4,
/obj/item/computer_hardware/hard_drive/portable/design/guns/pug = 3,
Expand Down
74 changes: 74 additions & 0 deletions code/modules/projectiles/guns/projectile/shotgun/gladstone.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
/obj/item/gun/projectile/shotgun/pump/gladstone
name = "\"Gladstone\" combat shotgun"
desc = "A venerable shotgun with incredibly dubious patent claims by H&S Arms, it serves as a common shotgun alongside a number of virtually identical weapons across the galaxy. \
Can hold up to 7+1 20mm shells in its tube magazine."
icon = 'icons/obj/guns/projectile/gladstone.dmi'
icon_state = "gladstone"
item_state = "gladstone"
origin_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 2)
max_shells = 7
caliber = CAL_SHOTGUN
damage_multiplier = 1.1
penetration_multiplier = 1.1 //Combat shotgun shouldn't be worse than makeshift shotgun
ammo_type = /obj/item/ammo_casing/shotgun
fire_sound = 'sound/weapons/guns/fire/shotgun.ogg'
matter = list(MATERIAL_PLASTEEL = 20, MATERIAL_PLASTIC = 6)
price_tag = 850
init_recoil = RIFLE_RECOIL(1.2)
saw_off = TRUE
sawn = /obj/item/gun/projectile/shotgun/pump/gladstone/sawn
serial_type = "H&S"

wield_delay = 1 SECOND
wield_delay_factor = 0.4 // 40 vig
gun_parts = list(/obj/item/part/gun/frame/gladstone = 1, /obj/item/part/gun/grip/black = 1, /obj/item/part/gun/mechanism/shotgun = 1, /obj/item/part/gun/barrel/shotgun = 1)

/obj/item/part/gun/frame/gladstone
name = "Gladstone frame"
desc = "A Gladstone shotgun frame. The everyman's shotgun."
icon_state = "frame_gladstone"
result = /obj/item/gun/projectile/shotgun/pump/gladstone
resultvars = list(/obj/item/gun/projectile/shotgun/pump/gladstone)
gripvars = list(/obj/item/part/gun/grip/black)
mechanismvar = /obj/item/part/gun/mechanism/shotgun
barrelvars = list(/obj/item/part/gun/barrel/shotgun)

/obj/item/gun/projectile/shotgun/pump/gladstone/sawn
name = "\"Gladstone\" stakeout shotgun"
desc = "A venerable shotgun that's been destroyed by some sort of heartless monster. Can hold up to 4+1 20mm shells in its tube magazine."
icon = 'icons/obj/guns/projectile/sawnoff/gladstone.dmi'
icon_state = "obrez"
item_state = "obrez"
gun_parts = list(/obj/item/part/gun/frame/gladstone = 1, /obj/item/stack/material/plastic = 1, /obj/item/part/gun/mechanism/shotgun = 1, /obj/item/stack/material/plasteel = 2)
max_shells = 4
w_class = ITEM_SIZE_BULKY
damage_multiplier = 0.8
penetration_multiplier = 0.9
matter = list(MATERIAL_PLASTEEL = 15, MATERIAL_PLASTIC = 6)
price_tag = 550
init_recoil = RIFLE_RECOIL(2.4)
saw_off = FALSE

wield_delay = 0.7 SECOND
wield_delay_factor = 0.3 // 30 vig

/obj/item/gun/projectile/shotgun/pump/gladstone/queen
name = "\"Fallen Empress\" hunting shotgun"
desc = "An anomalous weapon created by an unknown person (or group?), their work marked by a blue cross, these weapons are known to vanish and reappear when left alone. \
This particular shotgun was originally a gladstone, remodeled and reforged by Jea Smails, first matriarch of the hunting lodge. It was destroyed by a careless hunt master, only \
to reappear in the lodge, now marked with a blue cross. Perhaps attempts to destroy it now made it eternal? Whatever the case, it packs a hell of a punch. \
Can hold up to 14+1 20mm shells in its tube magazine."
icon = 'icons/obj/guns/projectile/shotgun_queen.dmi'
icon_state = "queen"
item_state = "queen"
origin_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 2)
max_shells = 14 //half a box in this massive gun
caliber = CAL_SHOTGUN
w_class = ITEM_SIZE_HUGE
damage_multiplier = 1.1
ammo_type = /obj/item/ammo_casing/shotgun
matter = list(MATERIAL_PLASTEEL = 25, MATERIAL_PLASTIC = 26)
price_tag = 20000 //Its amazing!
init_recoil = RIFLE_RECOIL(1.1)
saw_off = FALSE
serial_type = "BlueCross"
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
/obj/item/gun/projectile/automatic/pitbull,
/obj/item/gun/projectile/boltgun/lever,
/obj/item/gun/projectile/boltgun/sa = good_data("Mosin boltaction rifle", list(1, 5), 500),
/obj/item/gun/projectile/shotgun/pump/gladstone,
/obj/item/gun/projectile/shotgun/bull,
/obj/item/gun/projectile/shotgun/pug,
/obj/item/gun/projectile/shotgun/pump = good_data("Grizzly shotgun", list(1, 5), 700),
Expand Down
1 change: 1 addition & 0 deletions sojourn-station.dme
Original file line number Diff line number Diff line change
Expand Up @@ -2942,6 +2942,7 @@
#include "code\modules\projectiles\guns\projectile\shotgun\bull.dm"
#include "code\modules\projectiles\guns\projectile\shotgun\combatsg.dm"
#include "code\modules\projectiles\guns\projectile\shotgun\doublebarrel.dm"
#include "code\modules\projectiles\guns\projectile\shotgun\gladstone.dm"
#include "code\modules\projectiles\guns\projectile\shotgun\handmade.dm"
#include "code\modules\projectiles\guns\projectile\shotgun\hunter_crossbow.dm"
#include "code\modules\projectiles\guns\projectile\shotgun\pug.dm"
Expand Down

0 comments on commit 482a0da

Please sign in to comment.