Skip to content

Commit aed0b4d

Browse files
Add new tier of guns and bullets, add .357 caliber, plus minor gun tweaks (#482)
* Fix 'Zip' + 12g boxes * Add sprites for T2 guns * Add code for T2 pistol, pocket pistol, and shotgun * Oopsy-poopsy * Add .357 caliber, SMG code (no sprites yet), T2 .22LR ammo (sprites AND code) * Add T2 revolver, make T1 revolver use .357, add T2 SMG, add T2 .22LR bullets+proj * Add T2 .357 ammo + mags * Add T2 .45 ammo and mags * Add T2 5.56 ammo + mags + boltaction rifle * Add T2 12g slugs and buckshot * Add T2 laser rifle and laser pistol * Fix 'aluminium' spelling errors + other typos * Update nebula.dme * Revert "Update nebula.dme" This reverts commit c4baba0. * Update the right dme file (oops lol) * Fix icons + give new in-hand for Marine rifle * Update in-hand sprites for Marine and the T0 rifle who's name i forget * Add sprites for T2 5.56 bullet * Add belt + holstered sprites for Martin pistol * Fix 357 speedloader looking like .22LR mag * Fix 'Frontrunner' havign wrong atompath * Fix pocket pistols * Add T2 .45 box sprites * Add sprites for T2 .357 ammo boxes * Hopefully fix magazine woes across the board * Okay maybe this'll fix mags bein' weird * Revert "Okay maybe this'll fix mags bein' weird" This reverts commit 44fd849. * Okay this actually works * It's always the designs that getcha * Whoops * Fix T2 12g loose bullets having T1 name * Fix boxes maybe possibly perhaps??? * Update designs_ammunition.dm
1 parent 595e2c2 commit aed0b4d

48 files changed

Lines changed: 623 additions & 47 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

mods/persistence/_persistence.dme

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,13 @@
2525
#include "controllers\subsystems\mapping.dm"
2626
#include "controllers\subsystems\mining.dm"
2727
#include "controllers\subsystems\persistence.dm"
28+
#include "controllers\subsystems\skills.dm"
29+
#include "controllers\subsystems\initialization\chargen.dm"
30+
#include "controllers\subsystems\initialization\fabrication.dm"
2831
#include "controllers\subsystems\persistence\persistence_loading.dm"
2932
#include "controllers\subsystems\persistence\persistence_saving.dm"
3033
#include "controllers\subsystems\persistence\persistence_stats.dm"
3134
#include "controllers\subsystems\persistence\persistence_storage.dm"
32-
#include "controllers\subsystems\skills.dm"
33-
#include "controllers\subsystems\initialization\chargen.dm"
34-
#include "controllers\subsystems\initialization\fabrication.dm"
3535
#include "controllers\subsystems\processing\specifications.dm"
3636
#include "datums\extensions\extensions.dm"
3737
#include "datums\extensions\holster.dm"
@@ -234,12 +234,16 @@
234234
#include "modules\projectiles\ammunition\12g\magazines.dm"
235235
#include "modules\projectiles\ammunition\22_LR\bullets.dm"
236236
#include "modules\projectiles\ammunition\22_LR\magazines.dm"
237+
#include "modules\projectiles\ammunition\357\bullets.dm"
238+
#include "modules\projectiles\ammunition\357\magazines.dm"
237239
#include "modules\projectiles\ammunition\45\bullets.dm"
238240
#include "modules\projectiles\ammunition\45\magazines.dm"
239241
#include "modules\projectiles\guns\projectile.dm"
240242
#include "modules\projectiles\guns\energy\tier0\lasrifle.dm"
241243
#include "modules\projectiles\guns\energy\tier1\laspistol.dm"
242244
#include "modules\projectiles\guns\energy\tier1\lasrifle.dm"
245+
#include "modules\projectiles\guns\energy\tier2\laspistol.dm"
246+
#include "modules\projectiles\guns\energy\tier2\lasrifle.dm"
243247
#include "modules\projectiles\guns\projectile\tier0\boltaction.dm"
244248
#include "modules\projectiles\guns\projectile\tier0\pistol.dm"
245249
#include "modules\projectiles\guns\projectile\tier0\revolver.dm"
@@ -252,6 +256,12 @@
252256
#include "modules\projectiles\guns\projectile\tier1\shotgun_db.dm"
253257
#include "modules\projectiles\guns\projectile\tier1\shotgun_db_sawn.dm"
254258
#include "modules\projectiles\guns\projectile\tier1\shotgun_pump.dm"
259+
#include "modules\projectiles\guns\projectile\tier2\boltaction.dm"
260+
#include "modules\projectiles\guns\projectile\tier2\pistol.dm"
261+
#include "modules\projectiles\guns\projectile\tier2\pistol_pocket.dm"
262+
#include "modules\projectiles\guns\projectile\tier2\revolver.dm"
263+
#include "modules\projectiles\guns\projectile\tier2\shotgun_pump.dm"
264+
#include "modules\projectiles\guns\projectile\tier2\smg.dm"
255265
#include "modules\reagents\Chemistry-Holder.dm"
256266
#include "modules\reagents\chems\chems.dm"
257267
#include "modules\reagents\chems\recipes.dm"
@@ -282,6 +292,7 @@
282292
#include "modules\surgery\_surgery.dm"
283293
#include "modules\world_save\_persistence.dm"
284294
#include "modules\world_save\load_cache.dm"
295+
#include "modules\world_save\save_testing.dm"
285296
#include "modules\world_save\saved_vars.dm"
286297
#include "modules\world_save\saved_vars\matrix.dm"
287298
#include "modules\world_save\saved_vars\saved_icon_states.dm"
@@ -294,7 +305,6 @@
294305
#include "modules\world_save\serializers\one_off_serializer.dm"
295306
#include "modules\world_save\serializers\sql_serializer.dm"
296307
#include "modules\world_save\serializers\sql_serializer_db.dm"
297-
#include "modules\world_save\save_testing.dm"
298308
#include "modules\world_save\wrappers\_late_wrapper.dm"
299309
#include "modules\world_save\wrappers\_wrapper.dm"
300310
#include "modules\world_save\wrappers\_wrapper_holder.dm"
467 Bytes
Binary file not shown.
460 Bytes
Binary file not shown.
476 Bytes
Binary file not shown.
514 Bytes
Binary file not shown.
530 Bytes
Binary file not shown.
515 Bytes
Binary file not shown.
488 Bytes
Binary file not shown.
548 Bytes
Binary file not shown.
2.46 KB
Binary file not shown.

0 commit comments

Comments
 (0)