Skip to content

Commit

Permalink
Gives the carwo rifles names that suck less to refer to (#1223)
Browse files Browse the repository at this point in the history
its that shrimple i think

Co-authored-by: Paxilmaniac <[email protected]>
  • Loading branch information
Steals-The-PRs and Paxilmaniac authored Dec 21, 2023
1 parent 2bce0ba commit 5dcbf25
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// Base Sol rifle

/obj/item/gun/ballistic/automatic/sol_rifle
name = "\improper Carwo 'd'Infanteria' Rifle"
name = "\improper Carwo-Cawil Battle Rifle"
desc = "A heavy battle rifle commonly seen in the hands of SolFed military types. Accepts any standard SolFed rifle magazine."

icon = 'modular_skyrat/modules/modular_weapons/icons/obj/company_and_or_faction_based/carwo_defense_systems/guns48x.dmi'
Expand Down Expand Up @@ -57,7 +57,7 @@
/obj/item/gun/ballistic/automatic/sol_rifle/examine_more(mob/user)
. = ..()

. += "The d'Infanterie rifles are, as the name may imply, built by Carwo for \
. += "The Carwo-Cawil rifles are built by Carwo for \
use by SolFed's various infantry branches. Following the rather reasonable \
military requirements of using the same few cartridges and magazines, \
the lifespans of logistics coordinators and quartermasters everywhere \
Expand All @@ -74,7 +74,7 @@
// Sol marksman rifle

/obj/item/gun/ballistic/automatic/sol_rifle/marksman
name = "\improper Carwo 'd'Elite' Marksman Rifle"
name = "\improper Cawil Marksman Rifle"
desc = "A heavy marksman rifle commonly seen in the hands of SolFed military types. Accepts any standard SolFed rifle magazine."

icon_state = "elite"
Expand All @@ -100,7 +100,7 @@
/obj/item/gun/ballistic/automatic/sol_rifle/marksman/examine_more(mob/user)
. = ..()

. += "This particlar variant, often called 'd'Elite', is a marksman rifle. \
. += "This particlar variant is a marksman rifle. \
Automatic fire was forsaken for a semi-automatic setup, a more fitting \
stock, and more often than not a scope. Typically also seen with smaller \
magazines for convenience for the shooter, but as with any other Sol \
Expand All @@ -114,7 +114,7 @@
// Machinegun based on the base Sol rifle

/obj/item/gun/ballistic/automatic/sol_rifle/machinegun
name = "\improper Carwo 'd'Outomaties' Machinegun"
name = "\improper Qarad Light Machinegun"
desc = "A hefty machinegun commonly seen in the hands of SolFed military types. Accepts any standard SolFed rifle magazine."

icon_state = "outomaties"
Expand All @@ -134,7 +134,7 @@
/obj/item/gun/ballistic/automatic/sol_rifle/machinegun/examine_more(mob/user)
. = ..()

. += "The d'Outomaties variant of the rifle, what you are looking at now, \
. += "The 'Qarad' variant of the rifle, what you are looking at now, \
is a modification to turn the weapon into a passable, if sub-optimal \
light machinegun. To support the machinegun role, the internals were \
converted to make the gun into an open bolt, faster firing machine. These \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
new /obj/item/ammo_box/advanced/s12gauge/buckshot(src)

/datum/opposing_force_equipment/ranged/infanteria
name = "'d'Infanteria' Rifle"
name = "Carwo-Cawil Battle Rifle"
description = "A heavy battle rifle, this one seems to be painted tacticool black. Accepts any standard SolFed rifle magazine."
item_type = /obj/item/storage/toolbox/guncase/skyrat/opfor/infanteria

Expand Down

0 comments on commit 5dcbf25

Please sign in to comment.