Name Capitalisation Tweaks (Weapons) (#16906)

* Weapon names

* Assault rile

* More #coding_chat tweaks

Realistically changing the typepath here is out of the scope of this PR, but it's such a small change and I'm editing the item already so... probably not worth making an entire separate PR for.

* Missed these
This commit is contained in:
SabreML
2021-11-04 19:47:31 +01:00
committed by GitHub
parent 705768abd6
commit 1c3c2c22ad
24 changed files with 103 additions and 103 deletions
@@ -1,7 +1,7 @@
#define CHRONO_BEAM_RANGE 3
#define CHRONO_FRAME_COUNT 22
/obj/item/chrono_eraser
name = "Timestream Eradication Device"
name = "\improper Timestream Eradication Device"
desc = "The result of outlawed time-bluespace research, this device is capable of wiping a being from the timestream. They never are, they never were, they never will be."
icon = 'icons/obj/chronos.dmi'
icon_state = "chronobackpack"
@@ -41,7 +41,7 @@
/obj/item/gun/energy/chrono_gun
name = "T.E.D. Projection Apparatus"
name = "\improper T.E.D. Projection Apparatus"
desc = "It's as if they never existed in the first place."
icon = 'icons/obj/chronos.dmi'
icon_state = "chronogun"
@@ -104,7 +104,7 @@
payload = /obj/item/grenade/chem_grenade/cleaner
/obj/item/grenade/clusterbuster/teargas
name = "Oignon Teargas Grenade"
name = "\improper Oignon Teargas Grenade"
payload = /obj/item/grenade/chem_grenade/teargas
/obj/item/grenade/clusterbuster/facid
@@ -124,23 +124,23 @@
payload = /obj/item/grenade/spawnergrenade/spesscarp
/obj/item/grenade/clusterbuster/monster
name = "Monster Megabomb"
name = "\improper Monster Megabomb"
payload = /obj/item/grenade/chem_grenade/large/monster
/obj/item/grenade/clusterbuster/meat
name = "Mega Meat Grenade"
name = "\improper Mega Meat Grenade"
payload = /obj/item/grenade/chem_grenade/meat
/obj/item/grenade/clusterbuster/nervegas
name = "Nerve Gas Clusterbomb"
name = "\improper Nerve Gas Clusterbomb"
payload = /obj/item/grenade/chem_grenade/saringas
/obj/item/grenade/clusterbuster/megadirt
name = "Megamaid's Revenge Grenade"
name = "\improper Megamaid's Revenge Grenade"
payload = /obj/item/grenade/chem_grenade/dirt
/obj/item/grenade/clusterbuster/ultima
name = "Earth Shattering Kaboom"
name = "\improper Earth Shattering Kaboom"
desc = "Contains one Aludium Q-36 explosive space modulator."
payload = /obj/item/grenade/chem_grenade/explosion
@@ -150,12 +150,12 @@
payload = /obj/item/grenade/chem_grenade/lube
/obj/item/grenade/clusterbuster/hippie
name = "Hippie Grenade"
name = "\improper Hippie Grenade"
desc = "Almost as good as the summer of '69."
payload = /obj/item/grenade/chem_grenade/drugs
/obj/item/grenade/clusterbuster/holy
name = "Purification Grenade"
name = "\improper Purification Grenade"
desc = "Blessed excessively."
payload = /obj/item/grenade/chem_grenade/holywater
@@ -165,52 +165,52 @@
payload = /obj/item/grenade/chem_grenade/hellwater
/obj/item/grenade/clusterbuster/booze
name = "Booze Grenade"
name = "\improper Booze Grenade"
payload = /obj/item/reagent_containers/food/drinks/bottle/random_drink
/obj/item/grenade/clusterbuster/honk
name = "Mega Honk Grenade"
name = "\improper Mega Honk Grenade"
payload = /obj/item/grown/bananapeel
/obj/item/grenade/clusterbuster/honk_evil
name = "Evil Mega Honk Grenade"
name = "\improper Evil Mega Honk Grenade"
payload = /obj/item/grenade/clown_grenade
/obj/item/grenade/clusterbuster/xmas
name = "Christmas Miracle"
name = "\improper Christmas Miracle"
payload = /obj/item/a_gift
/obj/item/grenade/clusterbuster/dirt
name = "Megamaid's Job Security Grenade"
name = "\improper Megamaid's Job Security Grenade"
payload = /obj/effect/decal/cleanable/random
/obj/item/grenade/clusterbuster/apocalypsefake
name = "Fun Bomb"
name = "\improper Fun Bomb"
desc = "Not like the other bomb."
payload = /obj/item/toy/spinningtoy
/obj/item/grenade/clusterbuster/apocalypse
name = "Apocalypse Bomb"
name = "\improper Apocalypse Bomb"
desc = "No matter what, do not EVER use this."
payload = /obj/singularity
/obj/item/grenade/clusterbuster/tools
name = "Quick Repair Grenade"
name = "\improper Quick Repair Grenade"
desc = "An assistant's every dream."
payload = /obj/random/tool
/obj/item/grenade/clusterbuster/tools
name = "Engineering Deployment Platfom"
name = "\improper Engineering Deployment Platfom"
desc = "For the that time when gearing up was just too hard."
payload = /obj/random/tech_supply
/obj/item/grenade/clusterbuster/toys
name = "Toy Delivery System"
name = "\improper Toy Delivery System"
desc = "Who needs skill at arcades anyway?"
payload = /obj/item/toy/random
/obj/item/grenade/clusterbuster/banquet
name = "Bork Bork Bonanza"
name = "\improper Bork Bork Bonanza"
desc = "Bork bork bork."
payload = /obj/item/grenade/clusterbuster/banquet/child
@@ -218,44 +218,44 @@
payload = /obj/item/grenade/chem_grenade/large/feast
/obj/item/grenade/clusterbuster/aviary
name = "Poly-Poly Grenade"
name = "\improper Poly-Poly Grenade"
desc = "That's an uncomfortable number of birds."
payload = /mob/living/simple_animal/parrot
/obj/item/grenade/clusterbuster/monkey
name = "Barrel of Monkeys"
name = "\improper Barrel of Monkeys"
desc = "Not really that much fun."
payload = /mob/living/carbon/human/monkey
/obj/item/grenade/clusterbuster/fluffy
name = "Fluffy Love Bomb"
name = "\improper Fluffy Love Bomb"
desc = "Exactly as snuggly as it sounds."
payload = /mob/living/simple_animal/pet/dog/corgi/puppy
/obj/item/grenade/clusterbuster/fox
name = "Troublemaking Grenade"
name = "\improper Troublemaking Grenade"
desc = "More trouble than two foxes combined."
payload = /mob/living/simple_animal/pet/dog/fox
/obj/item/grenade/clusterbuster/crab
name = "Crab Grenade"
name = "\improper Crab Grenade"
desc = "Reserved for those pesky request."
payload = /mob/living/simple_animal/crab
/obj/item/grenade/clusterbuster/plasma
name = "Plasma Cluster Grenade"
name = "\improper Plasma Cluster Grenade"
desc = "For when everything needs to die in a fire."
payload = /obj/item/grenade/gas
/obj/item/grenade/clusterbuster/n2o
name = "N2O Cluster Grenade"
name = "\improper N2O Cluster Grenade"
desc = "For when you need to knock out EVERYONE."
payload = /obj/item/grenade/gas/knockout
////////////Clusterbuster of Clusterbusters////////////
/obj/item/grenade/clusterbuster/mega_fox
name = "Mega Troublemaking Grenade."
name = "\improper Mega Troublemaking Grenade."
payload = /obj/item/grenade/clusterbuster/fox
/obj/item/grenade/clusterbuster/mega_bang
@@ -267,7 +267,7 @@
payload = /obj/item/grenade/clusterbuster/syndieminibomb
/obj/item/grenade/clusterbuster/mega_honk_evil
name = "Mega Evil Mega Honk Grenade."
name = "\improper Mega Evil Mega Honk Grenade."
payload = /obj/item/grenade/clusterbuster/honk_evil
/obj/item/grenade/clusterbuster/mega_emp
@@ -275,7 +275,7 @@
// --------------------------------------
/obj/item/storage/box/syndie_kit/remotegrenade
name = "Remote Grenade Kit"
name = "remote grenade kit"
/obj/item/storage/box/syndie_kit/remotegrenade/New()
..()
@@ -285,7 +285,7 @@
return
/obj/item/storage/box/syndie_kit/remoteemp
name = "Remote EMP Kit"
name = "remote EMP kit"
/obj/item/storage/box/syndie_kit/remoteemp/New()
..()
@@ -295,7 +295,7 @@
return
/obj/item/storage/box/syndie_kit/remotelube
name = "Remote Lube Kit"
name = "remote lube kit"
/obj/item/storage/box/syndie_kit/remotelube/New()
..()
@@ -13,7 +13,7 @@
// Grants the wielder the Highlander Style Martial Art
/obj/item/claymore/highlander
name = "Highlander Claymore"
name = "\improper Highlander claymore"
desc = "Imbues the wielder with legendary martial prowress and a nigh-unquenchable thirst for glorious battle!"
var/datum/martial_art/highlander/style = new
@@ -157,7 +157,7 @@
new /obj/item/dnainjector/h2m(src)
/obj/item/storage/box/slug
name = "Ammunition Box (Slug)"
name = "ammunition box (Slug)"
desc = "A small box capable of holding seven shotgun shells."
icon_state = "slugbox"
@@ -166,7 +166,7 @@
new /obj/item/ammo_casing/shotgun(src)
/obj/item/storage/box/buck
name = "Ammunition Box (Buckshot)"
name = "ammunition box (Buckshot)"
desc = "A small box capable of holding seven shotgun shells."
icon_state = "buckshotbox"
@@ -175,7 +175,7 @@
new /obj/item/ammo_casing/shotgun/buckshot(src)
/obj/item/storage/box/dragonsbreath
name = "Ammunition Box (Dragonsbreath)"
name = "ammunition box (Dragonsbreath)"
desc = "A small box capable of holding seven shotgun shells."
icon_state = "dragonsbreathbox"
@@ -184,7 +184,7 @@
new /obj/item/ammo_casing/shotgun/incendiary/dragonsbreath(src)
/obj/item/storage/box/stun
name = "Ammunition Box (Stun shells)"
name = "ammunition box (Stun shells)"
desc = "A small box capable of holding seven shotgun shells."
icon_state = "stunbox"
@@ -193,7 +193,7 @@
new /obj/item/ammo_casing/shotgun/stunslug(src)
/obj/item/storage/box/beanbag
name = "Ammunition Box (Beanbag shells)"
name = "ammunition box (Beanbag shells)"
desc = "A small box capable of holding seven shotgun shells."
icon_state = "beanbagbox"
@@ -202,7 +202,7 @@
new /obj/item/ammo_casing/shotgun/beanbag(src)
/obj/item/storage/box/rubbershot
name = "Ammunition Box (Rubbershot shells)"
name = "ammunition box (Rubbershot shells)"
desc = "A small box capable of holding seven shotgun shells."
icon_state = "rubbershotbox"
@@ -211,7 +211,7 @@
new /obj/item/ammo_casing/shotgun/rubbershot(src)
/obj/item/storage/box/tranquilizer
name = "Ammunition Box (Tranquilizer darts)"
name = "ammunition box (Tranquilizer darts)"
desc = "A small box capable of holding seven shotgun shells."
icon_state = "tranqbox"
@@ -512,8 +512,8 @@
new /obj/item/clothing/suit/syndicatefake(src)
/obj/item/storage/box/enforcer_rubber
name = "enforcer pistol kit (rubber)"
desc = "A box marked with pictures of an enforcer pistol, two ammo clips, and the word 'NON-LETHAL'."
name = "\improper Enforcer pistol kit (rubber)"
desc = "A box marked with pictures of an Enforcer pistol, two ammo clips, and the word 'NON-LETHAL'."
icon_state = "box_ert"
/obj/item/storage/box/enforcer_rubber/populate_contents()
@@ -522,8 +522,8 @@
new /obj/item/ammo_box/magazine/enforcer(src)
/obj/item/storage/box/enforcer_lethal
name = "enforcer pistol kit (lethal)"
desc = "A box marked with pictures of an enforcer pistol, two ammo clips, and the word 'LETHAL'."
name = "\improper Enforcer pistol kit (lethal)"
desc = "A box marked with pictures of an Enforcer pistol, two ammo clips, and the word 'LETHAL'."
icon_state = "box_ert"
/obj/item/storage/box/enforcer_lethal/populate_contents()
@@ -147,7 +147,7 @@
new /obj/item/ammo_box/a357(src)
/obj/item/storage/box/syndie_kit/boolets
name = "Shotgun shells"
name = "shotgun shells"
/obj/item/storage/box/syndie_kit/boolets/populate_contents()
for(var/I in 1 to 6)
@@ -162,7 +162,7 @@
new /obj/item/implanter/emp/(src)
/obj/item/storage/box/syndie_kit/c4
name = "Pack of C-4 Explosives"
name = "pack of C-4 explosives"
/obj/item/storage/box/syndie_kit/c4/populate_contents()
for(var/I in 1 to 5)
@@ -181,7 +181,7 @@
new /obj/item/restraints/legcuffs/bola/tactical(src)
/obj/item/storage/box/syndie_kit/sarin
name = "Sarin Gas Grenades"
name = "sarin gas grenades"
/obj/item/storage/box/syndie_kit/sarin/populate_contents()
new /obj/item/grenade/chem_grenade/saringas(src)
@@ -220,7 +220,7 @@
/obj/item/storage/box/syndie_kit/atmosn2ogrenades
name = "Atmos N2O Grenades"
name = "atmos N2O grenades"
/obj/item/storage/box/syndie_kit/atmosn2ogrenades/populate_contents()
new /obj/item/grenade/clusterbuster/n2o(src)
@@ -228,7 +228,7 @@
/obj/item/storage/box/syndie_kit/atmosfiregrenades
name = "Plasma Fire Grenades"
name = "plasma fire grenades"
/obj/item/storage/box/syndie_kit/atmosfiregrenades/populate_contents()
new /obj/item/grenade/clusterbuster/plasma(src)
+2 -2
View File
@@ -518,7 +518,7 @@
/obj/item/twohanded/spear/kidan
icon_state = "kidanspear0"
name = "Kidan spear"
name = "\improper Kidan spear"
desc = "A spear brought over from the Kidan homeworld."
// DIY CHAINSAW
@@ -589,7 +589,7 @@
///CHAINSAW///
/obj/item/twohanded/chainsaw
icon_state = "chainsaw0"
name = "Chainsaw"
name = "chainsaw"
desc = "Perfect for felling trees or fellow spacemen."
force = 15
throwforce = 15
+2 -2
View File
@@ -107,7 +107,7 @@
attack_verb = list("jabbed","stabbed","ripped")
/obj/item/wirerod
name = "Wired rod"
name = "wired rod"
desc = "A rod with some wire wrapped around the top. It'd be easy to attach something to the top bit."
icon_state = "wiredrod"
item_state = "rods"
@@ -167,7 +167,7 @@
/obj/item/spear/kidan
icon_state = "kidanspear"
name = "Kidan spear"
name = "\improper Kidan spear"
desc = "A one-handed spear brought over from the Kidan homeworld."
icon_state = "kidanspear"
item_state = "kidanspear"