diff --git a/.gitignore b/.gitignore index da85a131..ce2384c9 100644 --- a/.gitignore +++ b/.gitignore @@ -16,3 +16,11 @@ maps/newmedical tgstation2.dmm *.bak2 maps/tgstation2_medbayrework_final.dmm Outpost.dmm +aurora.dme +data/investigate/gravity.html +data/investigate/gravity.html +config/admins.txt +config/admin_ranks.txt +data/investigate/gravity.html +data/investigate/gravity.html +data/investigate/gravity.html diff --git a/code/modules/projectiles/ammunition/boxes.dm b/code/modules/projectiles/ammunition/boxes.dm index 53b30db3..4eea2e42 100644 --- a/code/modules/projectiles/ammunition/boxes.dm +++ b/code/modules/projectiles/ammunition/boxes.dm @@ -67,7 +67,7 @@ icon_state = "9mm" origin_tech = "combat=2" ammo_type = "/obj/item/ammo_casing/c9mm" - max_ammo = 30 + max_ammo = 36 @@ -76,7 +76,7 @@ icon_state = "9mm" origin_tech = "combat=2" ammo_type = "/obj/item/ammo_casing/c45" - max_ammo = 30 + max_ammo = 32 @@ -149,4 +149,37 @@ icon_state = "45" ammo_type = "/obj/item/ammo_casing/chameleon" max_ammo = 0 - multiple_sprites = 1 \ No newline at end of file + multiple_sprites = 1 +/* +// Tried to steal these from Para. They're kind of funky. + +/obj/item/ammo_magazine/a12mm + name = "Ammunition Box (12mm)" + icon_state = "9mm" + origin_tech = "combat=2" + ammo_type = "/obj/item/ammo_casing/a12mm" + max_ammo = 40 + +/obj/item/ammo_magazine/shotgun + name = "Ammunition Box (slug)" + icon_state = "9mm" + origin_tech = "combat=2" + ammo_type = "/obj/item/ammo_casing/shotgun" + max_ammo = 8 + m_amt = 100000 + +/obj/item/ammo_magazine/shotgun/buck + name = "Ammunition Box (buckshot)" + ammo_type = "/obj/item/ammo_casing/buck" + +/obj/item/ammo_magazine/shotgun/stun + name = "Ammunition Box (stun shells)" + ammo_type = "/obj/item/ammo_casing/stunshell" + m_amt = 20000 + +/obj/item/ammo_magazine/shotgun/beanbag + name = "Ammunition Box (beanbag shells)" + ammo_type = "/obj/item/ammo_casing/beanbag" + m_amt = 4000 + + */ \ No newline at end of file diff --git a/icons/obj/ammo.dmi b/icons/obj/ammo.dmi index 10fae561..1eb42be2 100644 Binary files a/icons/obj/ammo.dmi and b/icons/obj/ammo.dmi differ