Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 4256e70

Browse filesBrowse files
ynot01ynot01
authored
calibre defines (yogstation13#21227)
1 parent 86ecfc6 commit 4256e70
Copy full SHA for 4256e70

38 files changed

+152-117Lines changed: 152 additions & 117 deletions

File tree

Expand file treeCollapse file tree
Open diff view settings
Filter options
Expand file treeCollapse file tree
Open diff view settings
Collapse file

‎code/__DEFINES/ammo.dm‎

Copy file name to clipboard
+34Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
/// Caliber defines
2+
/// Guns
3+
#define CALIBER_10MM "10mm" // 10mm Auto (Stechkin)
4+
#define CALIBER_12GA "shotgun" // 12 Gauge (Shotguns)
5+
#define CALIBER_308 "m308" // .308 Winchester (Winton Mk. VI Repeating Rifle, LWT-650 DMR)
6+
#define CALIBER_310 "310" // .310 Cadet (Lionhunter's Rifle)
7+
#define CALIBER_32ACP "32trac" // .32 ACP (Caldwell Tracking Revolver)
8+
#define CALIBER_357MAG "357" // .357 Magnum (Revolver)
9+
#define CALIBER_38 "38" // .38 Special (Detective Revolver)
10+
#define CALIBER_40GL "40mm" // 40x46mm LV (Grenade Launchers)
11+
#define CALIBER_44MAG "44" // .44 Magnum (Unica 6 autorevolver)
12+
#define CALIBER_45ACP ".45" // .45 ACP (M1911, Surplus Carbine, C20r)
13+
#define CALIBER_46X30 "4.6x30mm" // HK 4.6x30mm (WT-550)
14+
#define CALIBER_50AE ".50ae" // .50 Action Express (Desert Eagle)
15+
#define CALIBER_50BMG ".50bmg" // .50 BMG (Sniper Rifle)
16+
#define CALIBER_546MM "a546" // 5.46mm (Osprey Minigun)
17+
#define CALIBER_556NATO "a556" // 5.56x45mm NATO (NT-ARG, M-90gl)
18+
#define CALIBER_712X82 "mm71282" // 7.12x82mm (L6 SAW)
19+
#define CALIBER_75 ".75" // .75 caliber (Imperial Bolt Pistol)
20+
#define CALIBER_75GYRO "75" // 75mm rocket (Gyrojet Pistol)
21+
#define CALIBER_762X38R "n762" // 7.62x38mmR (Nagant Revolver)
22+
#define CALIBER_762X54R "a762" // 7.62x54mmR (Nagant Rifle)
23+
#define CALIBER_84HE "84mm" // 84mm anti-tank (Rocket Launcher)
24+
#define CALIBER_9X19 "9mm" // 9x19mm Parabellum (Stechkin APS, Uzi)
25+
#define CALIBER_BREACH "breaching" // 12 Gauge (Breaching Shotgun)
26+
#define CALIBER_CANNON "100mm" // Cannonball (Hand Cannon)
27+
#define CALIBER_FOAM "foam_force" // Foam darts (Toy Guns)
28+
#define CALIBER_GATLING "gatling" // Gatling (Osprey Minigun) (Don't ask)
29+
#define CALIBER_SPEAR "speargun" // Spear (Speargun)
30+
31+
/// Magic and other esoteric non-gun stuff
32+
#define CALIBER_ARROW "arrow" // Bows
33+
#define CALIBER_HOOK "hook" // Meat hook and other hooks
34+
#define CALIBER_TENTACLE "tentacle" // Ling tentacle
Collapse file

‎code/datums/martial/ultra_violence.dm‎

Copy file name to clipboardExpand all lines: code/datums/martial/ultra_violence.dm
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,13 +150,13 @@
150150
/obj/item/ammo_box/magazine/internal/cylinder/ipcmartial
151151
name = "\improper Piercer cylinder"
152152
ammo_type = /obj/item/ammo_casing/ipcmartial
153-
caliber = "357"
153+
caliber = CALIBER_357MAG
154154
max_ammo = 3
155155

156156
/obj/item/ammo_casing/ipcmartial
157157
name = ".357 sharpshooter bullet casing"
158158
desc = "A .357 sharpshooter bullet casing."
159-
caliber = "357"
159+
caliber = CALIBER_357MAG
160160
projectile_type = /obj/projectile/bullet/ipcmartial
161161
click_cooldown_override = 0.1 //this gun shoots faster
162162

Collapse file

‎code/game/objects/items/devices/busterarm/wire_snatch.dm‎

Copy file name to clipboardExpand all lines: code/game/objects/items/devices/busterarm/wire_snatch.dm
+4-4Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@
9595
name = "hook"
9696
desc = "A hook."
9797
projectile_type = /obj/projectile/wire
98-
caliber = "hook"
98+
caliber = CALIBER_HOOK
9999
icon_state = "hook"
100100

101101
/// Projectile
@@ -129,7 +129,7 @@
129129
var/mob/living/carbon/human/H = firer
130130
if(!H)
131131
return
132-
H.apply_status_effect(STATUS_EFFECT_DOUBLEDOWN)
132+
H.apply_status_effect(STATUS_EFFECT_DOUBLEDOWN)
133133
if(isobj(target)) // If it's an object
134134
var/obj/item/I = target
135135
if(!I?.anchored) // Give it to us if it's not anchored
@@ -152,7 +152,7 @@
152152
var/armor = L.run_armor_check(limb_to_hit, MELEE, armour_penetration = 35)
153153
if(!L.anchored) // Only pull them if they're unanchored
154154
if(istype(H))
155-
L.visible_message(span_danger("[L] is pulled by [H]'s wire!"),span_userdanger("A wire grabs you and pulls you towards [H]!"))
155+
L.visible_message(span_danger("[L] is pulled by [H]'s wire!"),span_userdanger("A wire grabs you and pulls you towards [H]!"))
156156
L.Immobilize(1.0 SECONDS)
157157
if(prob(5))
158158
firer.say("GET OVER HERE!!")//slicer's request
@@ -166,7 +166,7 @@
166166
// If we happen to be facing a dense object after the wire snatches them, like a table or window
167167
for(var/obj/D in T.contents)
168168
if(D.density == TRUE)
169-
D.take_damage(50)
169+
D.take_damage(50)
170170
L.apply_damage(15, BRUTE, limb_to_hit, armor, wound_bonus=CANT_WOUND)
171171
L.forceMove(Q)
172172
to_chat(H, span_warning("[H] catches [L] throws [L.p_them()] against [D]!"))
Collapse file

‎code/modules/antagonists/changeling/powers/mutations.dm‎

Copy file name to clipboardExpand all lines: code/modules/antagonists/changeling/powers/mutations.dm
+5-5Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@
288288
name = "tentacle"
289289
desc = "A tentacle."
290290
projectile_type = /obj/projectile/tentacle
291-
caliber = "tentacle"
291+
caliber = CALIBER_TENTACLE
292292
icon_state = "tentacle_end"
293293
firing_effect_type = null
294294
var/obj/item/gun/magic/tentacle/gun //the item that shot it
@@ -613,23 +613,23 @@
613613
if(synthetic)
614614
can_drop = TRUE
615615

616-
/obj/item/melee/flesh_maul/afterattack(atom/target, mob/user, proximity)
616+
/obj/item/melee/flesh_maul/afterattack(atom/target, mob/user, proximity)
617617
. = ..()
618618
if(!proximity)
619619
return
620620
if(iscarbon(target))
621621
var/mob/living/carbon/C = target
622622
C.add_movespeed_modifier("flesh maul", update=TRUE, priority=101, multiplicative_slowdown=1) //Slows the target because big whack
623-
addtimer(CALLBACK(C, TYPE_PROC_REF(/mob, remove_movespeed_modifier), "flesh maul"), 2 SECONDS, TIMER_UNIQUE|TIMER_OVERRIDE)
623+
addtimer(CALLBACK(C, TYPE_PROC_REF(/mob, remove_movespeed_modifier), "flesh maul"), 2 SECONDS, TIMER_UNIQUE|TIMER_OVERRIDE)
624624
to_chat(target, span_danger("You are staggered from the blow!"))
625625

626626
else if(iscyborg(target))
627627
var/mob/living/silicon/robot/R = target
628628
R.Paralyze(1 SECONDS) //One second stun on borgs because they get their circuits rattled or something
629629

630-
else if(isstructure(target) || ismachinery(target))
630+
else if(isstructure(target) || ismachinery(target))
631631
var/obj/structure/S = target //Works for machinery because they have the same variable that does the same thing
632-
var/structure_damage = S.max_integrity
632+
var/structure_damage = S.max_integrity
633633
var/make_sound = TRUE
634634
if(istype(target, /obj/structure/window) || istype(target, /obj/structure/grille))
635635
structure_damage *= 2 // Because of melee armor
Collapse file

‎code/modules/antagonists/eldritch_cult/eldritch_gun.dm‎

Copy file name to clipboardExpand all lines: code/modules/antagonists/eldritch_cult/eldritch_gun.dm
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,15 @@
2020
/obj/item/ammo_box/magazine/internal/boltaction/lionhunter
2121
name = "lionhunter rifle internal magazine"
2222
ammo_type = /obj/item/ammo_casing/strilka310/lionhunter
23-
caliber = "CALIBER_STRILKA310"
23+
caliber = CALIBER_310
2424
max_ammo = 3
2525
multiload = 1
2626

2727
/obj/item/ammo_casing/strilka310/lionhunter
2828
name = "strilka310 bullet casing"
2929
desc = "A .310 bullet casing."
3030
icon_state = "310-casing"
31-
caliber = "CALIBER_STRILKA310"
31+
caliber = CALIBER_310
3232
projectile_type = /obj/projectile/bullet/strilka310/lionhunter
3333
/// Whether we're currently aiming this casing at something
3434
var/currently_aiming = FALSE
Collapse file

‎code/modules/mining/lavaland/necropolis_chests.dm‎

Copy file name to clipboardExpand all lines: code/modules/mining/lavaland/necropolis_chests.dm
+6-6Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -188,9 +188,9 @@ GLOBAL_LIST_EMPTY(aide_list)
188188
if(active_owner && user == active_owner)
189189
var/safety = alert(user, "Doing this will instantly kill you, reducing you to nothing but dust.", "Take off [src]?", "Abort", "Proceed")
190190
if(safety != "Proceed")
191-
return
191+
return
192192
. = ..()
193-
193+
194194
/obj/item/clothing/neck/necklace/memento_mori/dropped(mob/user)
195195
..()
196196
if(active_owner)
@@ -413,7 +413,7 @@ GLOBAL_LIST_EMPTY(aide_list)
413413
name = "hook"
414414
desc = "A hook."
415415
projectile_type = /obj/projectile/hook
416-
caliber = "hook"
416+
caliber = CALIBER_HOOK
417417
icon_state = "hook"
418418

419419
/obj/projectile/hook
@@ -679,7 +679,7 @@ GLOBAL_LIST_EMPTY(aide_list)
679679
icon = 'icons/obj/lavaland/artefacts.dmi'
680680
icon_state = "syndi_potionflask"
681681
desc = "An ornate red bottle, with an \"S\" embossed into the underside. Filled with an experimental flight potion. Mileage may vary."
682-
682+
683683
/obj/item/reagent_containers/glass/bottle/potion/flight
684684
name = "strange elixir"
685685
desc = "A flask with an almost-holy aura emitting from it. The label on the bottle says: 'erqo'hyy tvi'rf lbh jv'atf'."
@@ -1858,7 +1858,7 @@ GLOBAL_LIST_EMPTY(aide_list)
18581858
resistance_flags = LAVA_PROOF | FIRE_PROOF | UNACIDABLE | ACID_PROOF
18591859
actions_types = list(/datum/action/item_action/band)
18601860
var/limit = 3
1861-
var/telerange = 20
1861+
var/telerange = 20
18621862
var/next_tap = 0
18631863
var/next_band = 0
18641864
var/next_teleport = 0
@@ -1972,7 +1972,7 @@ GLOBAL_LIST_EMPTY(aide_list)
19721972
aide.forceMove(O)
19731973
playsound(aide, 'sound/magic/teleport_app.ogg', 20, 1)
19741974
next_band = world.time + COOLDOWN_BAND
1975-
1975+
19761976

19771977
/obj/item/cane/cursed/afterattack(mob/living/target , mob/living/carbon/user, proximity)
19781978
.=..()
Collapse file

‎code/modules/projectiles/ammunition/ballistic/lmg.dm‎

Copy file name to clipboardExpand all lines: code/modules/projectiles/ammunition/ballistic/lmg.dm
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
name = "7.12x82mm bullet casing"
55
desc = "A 7.12x82mm bullet casing."
66
icon_state = "762-casing"
7-
caliber = "mm71282"
7+
caliber = CALIBER_712X82
88
projectile_type = /obj/projectile/bullet/mm712x82
99

1010
/obj/item/ammo_casing/mm712x82/ap
Collapse file

‎code/modules/projectiles/ammunition/ballistic/minigun.dm‎

Copy file name to clipboardExpand all lines: code/modules/projectiles/ammunition/ballistic/minigun.dm
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@
44
name = "5.46mm bullet casing"
55
desc = "A 5.46mm bullet casing. Wait, the fuck is a 5.46"
66
icon_state = "556-casing" // Most bullets use this casing and this gun does not even drop any so...
7-
caliber = "a546"
7+
caliber = CALIBER_546MM
88
projectile_type = /obj/projectile/bullet/a546
Collapse file

‎code/modules/projectiles/ammunition/ballistic/pistol.dm‎

Copy file name to clipboardExpand all lines: code/modules/projectiles/ammunition/ballistic/pistol.dm
+6-6Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@
33
/obj/item/ammo_casing/c10mm
44
name = "10mm bullet casing"
55
desc = "A 10mm bullet casing."
6-
caliber = "10mm"
6+
caliber = CALIBER_10MM
77
projectile_type = /obj/projectile/bullet/c10mm
88

99
/obj/item/ammo_casing/caseless/c10mm/cs
1010
name = "10mm caseless bullet"
1111
desc = "A 10mm caseless bullet."
12-
caliber = "10mm"
12+
caliber = CALIBER_10MM
1313
projectile_type = /obj/projectile/bullet/c10mm/cs
1414

1515
/obj/item/ammo_casing/c10mm/ap
@@ -43,7 +43,7 @@
4343
/obj/item/ammo_casing/c9mm
4444
name = "9mm bullet casing"
4545
desc = "A 9mm bullet casing."
46-
caliber = "9mm"
46+
caliber = CALIBER_9X19
4747
projectile_type = /obj/projectile/bullet/c9mm
4848

4949
/obj/item/ammo_casing/c9mm/ap
@@ -62,20 +62,20 @@
6262
/obj/item/ammo_casing/a50AE
6363
name = ".50 AE bullet casing"
6464
desc = "A .50 AE bullet casing."
65-
caliber = ".50ae"
65+
caliber = CALIBER_50AE
6666
projectile_type = /obj/projectile/bullet/a50AE
6767

6868
// Bolt Pistol
6969

7070
/obj/item/ammo_casing/boltpistol
7171
name = ".75 bolt round casing"
7272
desc = "A .75 bolt round casing."
73-
caliber = ".75"
73+
caliber = CALIBER_75
7474
projectile_type = /obj/projectile/bullet/boltpistol
7575

7676
/obj/item/ammo_casing/boltpistol/admin
7777
name = ".75 bolt round casing"
7878
desc = "A .75 bolt round casing. This one feels more powerful somehow..."
79-
caliber = ".75"
79+
caliber = CALIBER_75
8080
projectile_type = /obj/projectile/bullet/boltpistol/admin
8181

Collapse file

‎code/modules/projectiles/ammunition/ballistic/revolver.dm‎

Copy file name to clipboardExpand all lines: code/modules/projectiles/ammunition/ballistic/revolver.dm
+5-5Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
/obj/item/ammo_casing/a357
44
name = ".357 magnum bullet casing"
55
desc = "A .357 magnum bullet casing."
6-
caliber = "357"
6+
caliber = CALIBER_357MAG
77
projectile_type = /obj/projectile/bullet/a357
88

99
/obj/item/ammo_casing/a357/ironfeather
@@ -39,23 +39,23 @@
3939
name = ".44 magnum bullet casing"
4040
desc = "A .44 magnum bullet casing."
4141
icon_state = "44-casing"
42-
caliber = "44"
42+
caliber = CALIBER_44MAG
4343
projectile_type = /obj/projectile/bullet/m44
4444

4545
// 7.62x38mmR (Nagant Revolver)
4646

4747
/obj/item/ammo_casing/n762
4848
name = "7.62x38mmR bullet casing"
4949
desc = "A 7.62x38mmR bullet casing."
50-
caliber = "n762"
50+
caliber = CALIBER_762X38R
5151
projectile_type = /obj/projectile/bullet/n762
5252

5353
// .38 (Colt Detective Special + Vatra M38)
5454

5555
/obj/item/ammo_casing/c38
5656
name = ".38 special bullet casing"
5757
desc = "A .38 special bullet casing."
58-
caliber = "38"
58+
caliber = CALIBER_38
5959
projectile_type = /obj/projectile/bullet/c38
6060

6161
/obj/item/ammo_casing/c38/rubber
@@ -88,5 +88,5 @@
8888
/obj/item/ammo_casing/tra32
8989
name = ".32 TRAC bullet casing"
9090
desc = "A .32 TRAC bullet casing."
91-
caliber = "32trac"
91+
caliber = CALIBER_32ACP
9292
projectile_type = /obj/projectile/bullet/tra32

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.