Skip to content

Commit

Permalink
Moves stuff around
Browse files Browse the repository at this point in the history
  • Loading branch information
private-tristan committed Dec 14, 2024
1 parent 0ef9cc9 commit c642852
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 4 deletions.
8 changes: 5 additions & 3 deletions code/datums/ammo/bullet/rifle.dm
Original file line number Diff line number Diff line change
Expand Up @@ -190,18 +190,20 @@
name = "irradiated armor-piercing 10x28 bullet"
debilitate = list(0,0,0,3,0,0,0,1)

// Terminator Smartgun

/datum/ammo/bullet/rifle/heavy/dirty
name = "irradiated 10x28 bullet"
damage = 60
debilitate = list(0,0,0,3,0,0,0,1)
damage = 60
headshot_state = HEADSHOT_OVERLAY_MEDIUM
shrapnel_chance = SHRAPNEL_CHANCE_TIER_7
damage_falloff = DAMAGE_FALLOFF_TIER_9

/datum/ammo/bullet/rifle/heavy/dirty/ap
/datum/ammo/bullet/rifle/heavy/ap/dirty
name = "irradiated armor-piercing 10x28 bullet"
debilitate = list(0,0,0,3,0,0,0,1)
damage = 45
penetration = ARMOR_PENETRATION_TIER_8

// RMC Smartgun

Expand Down
2 changes: 1 addition & 1 deletion code/modules/projectiles/guns/smartgun.dm
Original file line number Diff line number Diff line change
Expand Up @@ -690,7 +690,7 @@
/obj/item/weapon/gun/smartgun/dirty/elite
name = "\improper M56T 'Terminator' smartgun"
ammo_primary = /datum/ammo/bullet/rifle/heavy/dirty //Toggled ammo type
ammo_secondary = /datum/ammo/bullet/rifle/heavy/dirty/ap ///Toggled ammo type
ammo_secondary = /datum/ammo/bullet/rifle/heavy/ap/dirty ///Toggled ammo type
desc = "The actual firearm in the 4-piece M56T Smartgun System. If you have this, you're about to bring some serious pain to anyone in your way.\nYou may toggle firing restrictions by using a special action.\nAlt-click it to open the feed cover and allow for reloading."

/obj/item/weapon/gun/smartgun/dirty/elite/Initialize(mapload, ...)
Expand Down

0 comments on commit c642852

Please sign in to comment.