Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Coyote Bayou 2, Weapons and You pt. 1 #5362

Merged
merged 3 commits into from
Sep 24, 2024
Merged

Coyote Bayou 2, Weapons and You pt. 1 #5362

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
63f9507
this isn't gonna pass checks
Kilmented Sep 24, 2024
c2d0eaa
reverts changes to automatic.dm
Kilmented Sep 24, 2024
8e98169
revert changes to shotties
Kilmented Sep 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 14 additions & 7 deletions code/__DEFINES/ammo.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,28 @@
/*ALL DEFINES RELATED TO AMMO GO HERE*/

//Caliber defines

#define CALIBER_9MM "9mm rounds"
#define CALIBER_45ACP ".45 ACP rounds"

#define CALIBER_357 ".357 magnum rounds"
#define CALIBER_44 ".44 magnum rounds"

#define CALIBER_556 "5.56mm / .223 rounds"
#define CALIBER_308 ".308 rounds"

#define CALIBER_3006 ".30-06 rounds"
#define CALIBER_BALLBEARING "15mm ball bearings"

#define CALIBER_22LR ".22LR rounds"
#define CALIBER_BEE ".22LR bee rounds"
#define CALIBER_MOUSE ".22LR mouseshot rounds"
#define CALIBER_5MM "5mm rounds"
#define CALIBER_556 "5.56mm / .223 rounds"
#define CALIBER_308 ".308 rounds"
#define CALIBER_3006 ".30-06 rounds"
#define CALIBER_9MM "9mm rounds"

#define CALIBER_10MM "10mm rounds"
#define CALIBER_14MM "14mm rounds"
//#define CALIBER_38 ".38 special rounds"
#define CALIBER_357 ".357 magnum rounds"
#define CALIBER_44 ".44 magnum rounds"
#define CALIBER_45LC ".45 LC rounds"
#define CALIBER_45ACP ".45 ACP rounds"
#define CALIBER_4570 ".45-70 rounds"
#define CALIBER_50MG ".50MG rounds"
#define CALIBER_2MM "2mmEC gauss slugs"
Expand Down
2 changes: 2 additions & 0 deletions code/__DEFINES/materials.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,4 +12,6 @@
#define MATERIAL_ADD_PREFIX (1<<1)
#define MATERIAL_AFFECT_STATISTICS (1<<2)

#define SHEETS *1000

#define MATERIAL_SOURCE(mat) "[mat.name]_material"
Loading