Skip to content

Commit

Permalink
cupola and m56 mounted
Browse files Browse the repository at this point in the history
- Mounted SGs now utilize real 10x28
- Vehicle attachment M56 Cupolas also use 10x28
- All 10x28 sentry variants use same ammo
- irradiated smartgun drums now work with all smartguns
  • Loading branch information
AmoryBlaine committed Aug 17, 2024
1 parent bcb4e8b commit e133457
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 11 deletions.
4 changes: 2 additions & 2 deletions code/modules/cm_marines/smartgun_mount.dm
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
flags_magazine = NO_FLAGS //can't be refilled or emptied by hand
caliber = "10x28mm"
max_rounds = 700
default_ammo = /datum/ammo/bullet/machinegun
default_ammo = /datum/ammo/bullet/rifle/heavy
gun_type = null


Expand Down Expand Up @@ -428,7 +428,7 @@
health = 200
var/health_max = 200 //Why not just give it sentry-tier health for now.
var/atom/target = null // required for shooting at things.
var/datum/ammo/bullet/machinegun/ammo = /datum/ammo/bullet/machinegun
var/datum/ammo/bullet/rifle/heavy/ammo = /datum/ammo/bullet/rifle/heavy
var/obj/projectile/in_chamber = null
var/locked = 0 //1 means its locked inplace (this will be for sandbag MGs)
var/muzzle_flash_lum = 4
Expand Down
2 changes: 1 addition & 1 deletion code/modules/defenses/sentry.dm
Original file line number Diff line number Diff line change
Expand Up @@ -570,7 +570,7 @@
name = "Modified UA-577 Gauss Turret"
desc = "A deployable, semi-automated turret with AI targeting capabilities. Armed with an M30 Autocannon and a high-capacity drum magazine. This one's IFF system has been disabled, and it will open fire on any targets within range."
faction_group = null
ammo = new /obj/item/ammo_magazine/sentry/premade/dumb
ammo = new /obj/item/ammo_magazine/sentry

//the turret inside a static sentry deployment system
/obj/structure/machinery/defenses/sentry/premade/deployable
Expand Down
2 changes: 1 addition & 1 deletion code/modules/projectiles/ammo_boxes/round_boxes.dm
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@
name = "\improper smartgun ammunition box (10x28mm)"
desc = "A 10x28mm ammunition box. Used to refill smartgun drum magazines. It comes with a leather strap allowing to wear it on the back."
overlay_content = "_reg"
default_ammo = /datum/ammo/bullet/smartgun
default_ammo = /datum/ammo/bullet/rifle/heavy
caliber = "10x28mm"
bullet_amount = 1000
max_bullet_amount = 1000
Expand Down
3 changes: 0 additions & 3 deletions code/modules/projectiles/magazines/sentries.dm
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,6 @@
max_rounds = 99999
current_rounds = 99999

/obj/item/ammo_magazine/sentry/premade/dumb
default_ammo = /datum/ammo/bullet/rifle/heavy

/obj/item/ammo_magazine/sentry/upp
name = "AK-500 ammo drum (10x31mm Caseless)"
desc = "An ammo drum of 10x31mm caseless rounds for the UPPA 32-H sentry. Just feed it into the sentry gun's ammo port when its ammo is depleted."
Expand Down
2 changes: 1 addition & 1 deletion code/modules/projectiles/magazines/specialist.dm
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@
desc = "What at first glance appears to be a standard 500 round M56 Smartgun drum, is actually a drum loaded with irradiated rounds, providing an extra 'oomph' to to its bullets. The magazine itself is slightly modified to only fit in M56D or M56T smartguns, and is marked with a red X."
icon_state = "m56_drum_dirty"
default_ammo = /datum/ammo/bullet/smartgun/dirty
gun_type = /obj/item/weapon/gun/smartgun/dirty
gun_type = /obj/item/weapon/gun/smartgun

/obj/item/ammo_magazine/smartgun/holo_targetting
name = "holotargetting smartgun drum"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
/obj/item/ammo_magazine/hardpoint/m56_cupola
name = "M56 Cupola Magazine"
desc = "A secondary armament MG magazine"
caliber = "10x28mm" //Correlates to smartguns
caliber = "10x28mm"
icon = 'icons/obj/items/weapons/guns/ammo_by_faction/uscm.dmi'
icon_state = "cupola_1"
w_class = SIZE_LARGE
default_ammo = /datum/ammo/bullet/smartgun
default_ammo = /datum/ammo/bullet/rifle/heavy
max_rounds = 1000
gun_type = /obj/item/hardpoint/secondary/m56cupola

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
icon = 'icons/obj/items/weapons/guns/ammo_by_faction/uscm.dmi'
icon_state = "cupola_1"
w_class = SIZE_LARGE
default_ammo = /datum/ammo/bullet/smartgun/m56_fpw
default_ammo = /datum/ammo/bullet/rifle/heavy
max_rounds = 75
gun_type = /obj/item/hardpoint/special/firing_port_weapon

Expand Down

0 comments on commit e133457

Please sign in to comment.