cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-18 11:36:24 +01:00
Code Issues Packages Projects Releases Wiki Activity

Renames 9mm and 10mm to specific cartridges. (#4054)

Browse Source
This commit is contained in:
KathrinBailey
2021-03-12 15:02:48 +00:00
committed by GitHub
parent 1d353b4091
commit f3c8a6919b
6 changed files with 60 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/ammunition/ballistic/pistol.dm
+32 -16
View File
@@ -1,47 +1,63 @@
// 10mm
/obj/item/ammo_casing/c10mm
name = "10mm bullet casing"
desc = "A 10mm bullet casing."
// name = "10mm bullet casing" // SKYRAT EDIT: Original
// desc = "A 10mm bullet casing." // SKYRAT EDIT: Original
name = "10mm Magnum bullet casing" // SKYRAT EDIT
desc = "A 10mm Magnum bullet casing." // SKYRAT EDIT
caliber = CALIBER_10MM
projectile_type = /obj/projectile/bullet/c10mm
/obj/item/ammo_casing/c10mm/ap
name = "10mm armor-piercing bullet casing"
desc = "A 10mm armor-piercing bullet casing."
// name = "10mm armor-piercing bullet casing" // SKYRAT EDIT: Original
// desc = "A 10mm armor-piercing bullet casing." // SKYRAT EDIT: Original
name = "10mm Magnum armor-piercing bullet casing" // SKYRAT EDIT
desc = "A 10mm Magnum bullet casing with an armor-piercing projectile." // SKYRAT EDIT
projectile_type = /obj/projectile/bullet/c10mm_ap
/obj/item/ammo_casing/c10mm/hp
name = "10mm hollow-point bullet casing"
desc = "A 10mm hollow-point bullet casing."
// name = "10mm hollow-point bullet casing" // SKYRAT EDIT: Original
// desc = "A 10mm hollow-point bullet casing." // SKYRAT EDIT: Original
name = "10mm Magnum hollow-point bullet casing" // SKYRAT EDIT
desc = "A 10mm Magnum bullet casing with a hollow-point projectile." // SKYRAT EDIT
projectile_type = /obj/projectile/bullet/c10mm_hp
/obj/item/ammo_casing/c10mm/fire
name = "10mm incendiary bullet casing"
desc = "A 10mm incendiary bullet casing."
// name = "10mm incendiary bullet casing" // SKYRAT EDIT: Original
// desc = "A 10mm incendiary bullet casing." // SKYRAT EDIT: Original
name = "10mm Magnum incendiary bullet casing" // SKYRAT EDIT
desc = "A 10mm Magnum bullet casing. This leaves a burning trail and ignites its target." // SKYRAT EDIT
projectile_type = /obj/projectile/bullet/incendiary/c10mm
// 9mm (Makarov and Stechkin APS)
/obj/item/ammo_casing/c9mm
name = "9mm bullet casing"
desc = "A 9mm bullet casing."
// name = "9mm bullet casing" // SKYRAT EDIT: Original
// desc = "A 9mm bullet casing." // SKYRAT EDIT: Original
name = "9x25mm Mk.12 bullet casing" // SKYRAT EDIT
desc = "A modern 9x25mm Mk.12 bullet casing." // SKYRAT EDIT
caliber = CALIBER_9MM
projectile_type = /obj/projectile/bullet/c9mm
/obj/item/ammo_casing/c9mm/ap
name = "9mm armor-piercing bullet casing"
desc = "A 9mm armor-piercing bullet casing."
// name = "9mm armor-piercing bullet casing" // SKYRAT EDIT: Original
// desc = "A 9mm armor-piercing bullet casing." // SKYRAT EDIT: Original
name = "9x25mm Mk.12 armor-piercing bullet casing" // SKYRAT EDIT
desc = "A modern 9x25mm Mk.12 bullet casing. This one fires an armor-piercing projectile." // SKYRAT EDIT
projectile_type =/obj/projectile/bullet/c9mm_ap
/obj/item/ammo_casing/c9mm/hp
name = "9mm hollow-point bullet casing"
desc = "A 10mm hollow-point bullet casing."
// name = "9mm hollow-point bullet casing" // SKYRAT EDIT: Original
// desc = "A 10mm hollow-point bullet casing." // SKYRAT EDIT: Original
name = "9x25mm Mk.12 hollow-point bullet casing" // SKYRAT EDIT
desc = "A modern 9x25mm Mk.12 bullet casing. This one fires a hollow-point projectile. Very lethal to unarmored opponents." // SKYRAT EDIT
projectile_type = /obj/projectile/bullet/c9mm_hp
/obj/item/ammo_casing/c9mm/fire
name = "9mm incendiary bullet casing"
desc = "A 9mm incendiary bullet casing."
// name = "9mm incendiary bullet casing" // SKYRAT EDIT: Original
// desc = "A 9mm incendiary bullet casing." // SKYRAT EDIT: Original
name = "9x25mm Mk.12 incendiary bullet casing" // SKYRAT EDIT
desc = "A modern 9x25mm Mk.12 bullet casing. This incendiary round leaves a trail of fire and ignites its target." // SKYRAT EDIT
projectile_type = /obj/projectile/bullet/incendiary/c9mm
code/modules/projectiles/boxes_magazines/external/pistol.dm
Vendored
+18 -9
View File
@@ -1,5 +1,6 @@
/obj/item/ammo_box/magazine/m10mm
name = "pistol magazine (10mm)"
// name = "pistol magazine (10mm)" // SKYRAT EDIT: Original
name = "pistol magazine (10mm Magnum)" // SKYRAT EDIT: Calibre rename
desc = "A gun magazine."
icon_state = "9x19p"
ammo_type = /obj/item/ammo_casing/c10mm
@@ -20,7 +21,8 @@
icon_state = "[base_icon_state]-[min(ammo_count(), 8)]"
/obj/item/ammo_box/magazine/m9mm
name = "pistol magazine (9mm)"
// name = "pistol magazine (9mm)" // SKYRAT EDIT: Original
name = "pistol magazine (9x25mm)" // SKYRAT EDIT: Calibre rename
icon_state = "9x19p-8"
base_icon_state = "9x19p"
ammo_type = /obj/item/ammo_casing/c9mm
@@ -32,25 +34,29 @@
icon_state = "[base_icon_state]-[ammo_count() ? "8" : "0"]"
/obj/item/ammo_box/magazine/m9mm/fire
name = "pistol magazine (9mm incendiary)"
// name = "pistol magazine (9mm incendiary)" // SKYRAT EDIT: Original
name = "pistol magazine (9x25mm incendiary)"// SKYRAT EDIT: Calibre rename
icon_state = "9x19pI"
desc = "A gun magazine. Loaded with rounds which ignite the target."
ammo_type = /obj/item/ammo_casing/c9mm/fire
/obj/item/ammo_box/magazine/m9mm/hp
name = "pistol magazine (9mm HP)"
// name = "pistol magazine (9mm HP)" // SKYRAT EDIT: Original
name = "pistol magazine (9x25mm HP)" // SKYRAT EDIT: Calibre rename
icon_state = "9x19pH"
desc= "A gun magazine. Loaded with hollow-point rounds, extremely effective against unarmored targets, but nearly useless against protective clothing."
ammo_type = /obj/item/ammo_casing/c9mm/hp
/obj/item/ammo_box/magazine/m9mm/ap
name = "pistol magazine (9mm AP)"
// name = "pistol magazine (9mm AP)" // SKYRAT EDIT: Original
name = "pistol magazine (9x25mm AP)" // SKYRAT EDIT: Calibre rename
icon_state = "9x19pA"
desc= "A gun magazine. Loaded with rounds which penetrate armour, but are less effective against normal targets."
ammo_type = /obj/item/ammo_casing/c9mm/ap
/obj/item/ammo_box/magazine/m9mm_aps
name = "stechkin pistol magazine (9mm)"
// name = "stechkin pistol magazine (9mm)" // SKYRAT EDIT: Original
name = "stechkin pistol magazine (9x25mm)" // SKYRAT EDIT: Calibre rename
icon_state = "9mmaps-15"
base_icon_state = "9mmaps"
ammo_type = /obj/item/ammo_casing/c9mm
@@ -62,17 +68,20 @@
icon_state = "[base_icon_state]-[round(ammo_count(), 5)]"
/obj/item/ammo_box/magazine/m9mm_aps/fire
name = "stechkin pistol magazine (9mm incendiary)"
// name = "stechkin pistol magazine (9mm incendiary)" // SKYRAT EDIT: Original
name = "stechkin pistol magazine (9x25mm incendiary)" // SKYRAT EDIT: Calibre rename
ammo_type = /obj/item/ammo_casing/c9mm/fire
max_ammo = 15
/obj/item/ammo_box/magazine/m9mm_aps/hp
name = "stechkin pistol magazine (9mm HP)"
// name = "stechkin pistol magazine (9mm HP)" // SKYRAT EDIT: Original
name = "stechkin pistol magazine (9x25mm HP)" // SKYRAT EDIT: Calibre rename
ammo_type = /obj/item/ammo_casing/c9mm/hp
max_ammo = 15
/obj/item/ammo_box/magazine/m9mm_aps/ap
name = "stechkin pistol magazine (9mm AP)"
// name = "stechkin pistol magazine (9mm AP)" // SKYRAT EDIT: Original
name = "stechkin pistol magazine (9x25mm AP)" // SKYRAT EDIT: Calibre rename
ammo_type = /obj/item/ammo_casing/c9mm/ap
max_ammo = 15
code/modules/projectiles/boxes_magazines/external/rifle.dm
Vendored
+2 -1
View File
@@ -1,5 +1,6 @@
/obj/item/ammo_box/magazine/m10mm/rifle
name = "rifle magazine (10mm)"
// name = "rifle magazine (10mm)" // SKYRAT EDIT: Original
name = "rifle magazine (10mm Magnum)" // SKYRAT EDIT: Calibre rename
desc = "A well-worn magazine fitted for the surplus rifle."
icon_state = "75-8"
base_icon_state = "75"
code/modules/projectiles/guns/ballistic/automatic.dm
+2 -1
View File
@@ -358,7 +358,8 @@
/obj/item/gun/ballistic/automatic/surplus
name = "Surplus Rifle"
desc = "One of countless obsolete ballistic rifles that still sees use as a cheap deterrent. Uses 10mm ammo and its bulky frame prevents one-hand firing."
// desc = "One of countless obsolete ballistic rifles that still sees use as a cheap deterrent. Uses 10mm ammo and its bulky frame prevents one-hand firing." // SKYRAT EDIT: Original
desc = "One of countless obsolete ballistic rifles that still sees use as a cheap deterrent. Uses 10mm Magnum ammo and its bulky frame prevents one-hand firing." // SKYRAT EDIT: Calibre rename
icon_state = "surplus"
inhand_icon_state = "moistnugget"
worn_icon_state = null
code/modules/projectiles/guns/ballistic/pistol.dm
+2 -1
View File
@@ -1,6 +1,7 @@
/obj/item/gun/ballistic/automatic/pistol
name = "makarov pistol"
desc = "A small, easily concealable 9mm handgun. Has a threaded barrel for suppressors."
// desc = "A small, easily concealable 9mm handgun. Has a threaded barrel for suppressors." // SKYRAT EDIT: Original
desc = "A small, easily concealable 9x25mm Mk.12 handgun. Has a threaded barrel for suppressors." // SKYRAT EDIT: Calibre rename
icon_state = "pistol"
w_class = WEIGHT_CLASS_SMALL
mag_type = /obj/item/ammo_box/magazine/m9mm