cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-24 04:27:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Name Capitalisation Tweaks (Weapons) (#16906)

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/ammunition/ammo_casings.dm
+1 -1
View File
@@ -235,7 +235,7 @@
muzzle_flash_color = LIGHT_COLOR_FIRE
/obj/item/ammo_casing/shotgun/frag12
name = "FRAG-12 slug"
name = "\improper FRAG-12 slug"
desc = "A high explosive breaching round for a 12 gauge shotgun."
icon_state = "heshell"
projectile_type = /obj/item/projectile/bullet/frag12
code/modules/projectiles/ammunition/boxes.dm
+7 -7
View File
@@ -67,7 +67,7 @@
max_ammo = 14
/obj/item/ammo_box/shotgun
name = "Shotgun Speedloader (slug)"
name = "shotgun speedloader (Slug)"
icon_state = "slugloader"
origin_tech = "combat=2"
ammo_type = /obj/item/ammo_casing/shotgun
@@ -76,39 +76,39 @@
multiple_sprites = 1
/obj/item/ammo_box/shotgun/buck
name = "Shotgun Speedloader (buckshot)"
name = "shotgun speedloader (Buckshot)"
icon_state = "buckloader"
ammo_type = /obj/item/ammo_casing/shotgun/buckshot
/obj/item/ammo_box/shotgun/dragonsbreath
name = "Shotgun Speedloader (dragonsbreath)"
name = "shotgun speedloader (Dragonsbreath)"
icon_state = "dragonsbreathloader"
ammo_type = /obj/item/ammo_casing/shotgun/incendiary/dragonsbreath
/obj/item/ammo_box/shotgun/stun
name = "Shotgun Speedloader (stun shells)"
name = "shotgun speedloader (Stun shells)"
icon_state = "stunloader"
ammo_type = /obj/item/ammo_casing/shotgun/stunslug
/obj/item/ammo_box/shotgun/beanbag
name = "Shotgun Speedloader (beanbag shells)"
name = "shotgun speedloader (Beanbag shells)"
icon_state = "beanbagloader"
ammo_type = /obj/item/ammo_casing/shotgun/beanbag
materials = list(MAT_METAL=1750)
/obj/item/ammo_box/shotgun/rubbershot
name = "Shotgun Speedloader (rubbershot shells)"
name = "shotgun speedloader (Rubbershot shells)"
icon_state = "rubbershotloader"
ammo_type = /obj/item/ammo_casing/shotgun/rubbershot
materials = list(MAT_METAL=1750)
/obj/item/ammo_box/shotgun/tranquilizer
name = "Shotgun Speedloader (tranquilizer darts)"
name = "shotgun speedloader (Tranquilizer darts)"
icon_state = "tranqloader"
ammo_type = /obj/item/ammo_casing/shotgun/tranquilizer
materials = list(MAT_METAL=1750)
code/modules/projectiles/ammunition/magazines.dm
+7 -7
View File
@@ -290,7 +290,7 @@
icon_state = "uzi9mm-[round(ammo_count(),4)]"
/obj/item/ammo_box/magazine/smgm9mm
name = "SMG magazine (9mm)"
name = "\improper SMG magazine (9mm)"
icon_state = "smg9mm"
ammo_type = /obj/item/ammo_casing/c9mm
caliber = "9mm"
@@ -298,17 +298,17 @@
materials = list(MAT_METAL = 2000)
/obj/item/ammo_box/magazine/smgm9mm/ap
name = "SMG magazine (Armour Piercing 9mm)"
name = "\improper SMG magazine (Armour Piercing 9mm)"
ammo_type = /obj/item/ammo_casing/c9mm/ap
materials = list(MAT_METAL = 3000)
/obj/item/ammo_box/magazine/smgm9mm/toxin
name = "SMG magazine (Toxin Tipped 9mm)"
name = "\improper SMG magazine (Toxin Tipped 9mm)"
ammo_type = /obj/item/ammo_casing/c9mm/tox
materials = list(MAT_METAL = 3000)
/obj/item/ammo_box/magazine/smgm9mm/fire
name = "SMG Magazine (Incendiary 9mm)"
name = "\improper SMG Magazine (Incendiary 9mm)"
ammo_type = /obj/item/ammo_casing/c9mm/inc
materials = list(MAT_METAL = 3000)
@@ -328,7 +328,7 @@
icon_state = "9x19p-[ammo_count() ? "8" : "0"]"
/obj/item/ammo_box/magazine/smgm45
name = "SMG magazine (.45)"
name = "\improper SMG magazine (.45)"
icon_state = "c20r45"
origin_tech = "combat=2"
ammo_type = /obj/item/ammo_casing/c45
@@ -373,7 +373,7 @@
multiple_sprites = 2
/obj/item/ammo_box/magazine/m556/arg
name = "ARG magazine (5.56mm)"
name = "\improper ARG magazine (5.56mm)"
icon_state = "arg"
/obj/item/ammo_box/magazine/m12g
@@ -457,7 +457,7 @@
ammo_type = /obj/item/ammo_casing/caseless/foam_dart/riot
/obj/item/ammo_box/magazine/toy/enforcer
name = "Enforcer Foam magazine"
name = "\improper Enforcer foam magazine"
icon_state = "enforcer"
max_ammo = 8
multiple_sprites = 1
code/modules/projectiles/guns/energy/laser.dm
+1 -1
View File
@@ -115,7 +115,7 @@
ammo_type = list(/obj/item/ammo_casing/energy/xray)
/obj/item/gun/energy/immolator
name = "Immolator laser gun"
name = "immolator laser gun"
desc = "A modified laser gun, shooting highly concetrated beams with higher intensity that ignites the target, for the cost of draining more power per shot"
icon_state = "immolator"
item_state = "laser"
code/modules/projectiles/guns/energy/nuclear.dm
+1 -1
View File
@@ -72,7 +72,7 @@
can_holster = TRUE
/obj/item/gun/energy/gun/blueshield/pdw9
name = "PDW-9 taser pistol"
name = "\improper PDW-9 taser pistol"
desc = "A military grade sidearm, used by many militia forces throughout the local sector."
icon_state = "pdw9pistol"
code/modules/projectiles/guns/energy/special.dm
+2 -2
View File
@@ -294,7 +294,7 @@
// HONK Rifle //
/obj/item/gun/energy/clown
name = "HONK Rifle"
name = "\improper HONK rifle"
desc = "Clown Planet's finest."
icon_state = "disabler"
ammo_type = list(/obj/item/ammo_casing/energy/clown)
@@ -317,7 +317,7 @@
// Energy Sniper //
/obj/item/gun/energy/sniperrifle
name = "L.W.A.P. Sniper Rifle"
name = "\improper L.W.A.P. sniper rifle"
desc = "A rifle constructed of lightweight materials, fitted with a SMART aiming-system scope."
icon_state = "esniper"
origin_tech = "combat=6;materials=5;powerstorage=4"
code/modules/projectiles/guns/energy/telegun.dm
+1 -1
View File
@@ -1,7 +1,7 @@
// Telegun for Tator RDs
/obj/item/gun/energy/telegun
name = "Teleporter Gun"
name = "teleporter gun"
desc = "An extremely high-tech bluespace energy gun capable of teleporting targets to far off locations."
icon_state = "telegun"
item_state = "ionrifle"
code/modules/projectiles/guns/projectile/automatic.dm
+2 -2
View File
@@ -234,8 +234,8 @@
//ARG Assault Rifle//
/obj/item/gun/projectile/automatic/ar
name = "ARG"
desc = "A robust assault rile used by Nanotrasen fighting forces."
name = "\improper ARG"
desc = "A robust assault rifle used by Nanotrasen fighting forces."
icon_state = "arg"
item_state = "arg"
slot_flags = 0
code/modules/projectiles/guns/projectile/pistol.dm
+3 -3
View File
@@ -31,7 +31,7 @@
//Enforcer//
/obj/item/gun/projectile/automatic/pistol/enforcer
name = "Enforcer"
name = "\improper Enforcer"
desc = "A pistol of modern design."
icon_state = "enforcer_grey"
force = 10
@@ -78,7 +78,7 @@
//Desert Eagle//
/obj/item/gun/projectile/automatic/pistol/deagle
name = "desert eagle"
name = "\improper Desert Eagle"
desc = "A robust .50 AE handgun."
icon_state = "deagle"
force = 14.0
@@ -93,7 +93,7 @@
icon_state = "[initial(icon_state)][magazine ? "" : "-e"]"
/obj/item/gun/projectile/automatic/pistol/deagle/gold
desc = "A gold plated desert eagle folded over a million times by superior martian gunsmiths. Uses .50 AE ammo."
desc = "A gold plated Desert Eagle folded over a million times by superior martian gunsmiths. Uses .50 AE ammo."
icon_state = "deagleg"
item_state = "deagleg"