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

[MIRROR] Fixes a bunch of ammo sprite fuckups [MDB IGNORE] (#19878)

Browse Source 
* Fixes a bunch of ammo sprite fuckups

* Update pistol.dm

---------

Co-authored-by: ArcaneDefence <51932756+ArcaneDefence@users.noreply.github.com>
Co-authored-by: Gandalf <9026500+Gandalf2k15@users.noreply.github.com>
This commit is contained in:
SkyratBot
2023-03-27 04:26:39 +02:00
committed by GitHub
parent 0e4bb3e327
commit 3b750f4ea7
7 changed files with 20 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/boxes_magazines/external/lmg.dm
Vendored
+1 -1
View File
@@ -31,4 +31,4 @@
/obj/item/ammo_box/magazine/mm712x82/update_icon_state()
. = ..()
icon_state = "a762-[round(ammo_count(), 10)]"
icon_state = "a762-[min(round(ammo_count(), 10), 50)]" //Min is used to prevent high capacity magazines from attempting to get sprites with larger capacities
code/modules/projectiles/boxes_magazines/external/pistol.dm
Vendored
+9 -12
View File
@@ -11,21 +11,21 @@
/obj/item/ammo_box/magazine/m10mm/fire
name = "pistol magazine (10mm incendiary)"
icon_state = "9x19pI-8"
icon_state = "9x19pI"
base_icon_state = "9x19pI"
desc = "A gun magazine. Loaded with rounds which ignite the target."
ammo_type = /obj/item/ammo_casing/c10mm/fire
/obj/item/ammo_box/magazine/m10mm/hp
name = "pistol magazine (10mm HP)"
icon_state = "9x19pH-8"
icon_state = "9x19pH"
base_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/c10mm/hp
/obj/item/ammo_box/magazine/m10mm/ap
name = "pistol magazine (10mm AP)"
icon_state = "9x19pA-8"
icon_state = "9x19pA"
base_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/c10mm/ap
@@ -51,25 +51,22 @@
multiple_sprite_use_base = TRUE
/obj/item/ammo_box/magazine/m9mm/fire
//name = "pistol magazine (9mm incendiary)" // SKYRAT EDIT: Original
name = "pistol magazine (9x25mm incendiary)" // SKYRAT EDIT: Calibre rename
icon_state = "9x19pI-8"
name = "pistol magazine (9mm incendiary)"
icon_state = "9x19pI"
base_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)" // SKYRAT EDIT: Original
name = "pistol magazine (9x25mm HP)" // SKYRAT EDIT: Calibre rename
icon_state = "9x19pH-8"
name = "pistol magazine (9mm HP)"
icon_state = "9x19pH"
base_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)" // SKYRAT EDIT: Original
name = "pistol magazine (9x25mm AP)" // SKYRAT EDIT: Calibre rename
icon_state = "9x19pA-8"
name = "pistol magazine (9mm AP)"
icon_state = "9x19pA"
base_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
code/modules/projectiles/boxes_magazines/external/rifle.dm
Vendored
+1 -1
View File
@@ -8,7 +8,7 @@
/obj/item/ammo_box/magazine/m10mm/rifle/update_icon_state()
. = ..()
icon_state = "[base_icon_state]-[ammo_count() ? "8" : "0"]"
icon_state = "[base_icon_state]-[LAZYLEN(stored_ammo) ? "full" : "empty"]"
/obj/item/ammo_box/magazine/m556
name = "toploader magazine (5.56mm)"
code/modules/projectiles/boxes_magazines/external/shotgun.dm
Vendored
+5 -5
View File
@@ -13,25 +13,25 @@
/obj/item/ammo_box/magazine/m12g/stun
name = "shotgun magazine (12g taser slugs)"
icon_state = "m12gs"
base_icon_state = "m12gs"
ammo_type = /obj/item/ammo_casing/shotgun/stunslug
/obj/item/ammo_box/magazine/m12g/slug
name = "shotgun magazine (12g slugs)"
icon_state = "m12gb" //this may need an unique sprite
base_icon_state = "m12gsl"
ammo_type = /obj/item/ammo_casing/shotgun
/obj/item/ammo_box/magazine/m12g/dragon
name = "shotgun magazine (12g dragon's breath)"
icon_state = "m12gf"
base_icon_state = "m12gf"
ammo_type = /obj/item/ammo_casing/shotgun/dragonsbreath
/obj/item/ammo_box/magazine/m12g/bioterror
name = "shotgun magazine (12g bioterror)"
icon_state = "m12gt"
base_icon_state = "m12gt"
ammo_type = /obj/item/ammo_casing/shotgun/dart/bioterror
/obj/item/ammo_box/magazine/m12g/meteor
name = "shotgun magazine (12g meteor slugs)"
icon_state = "m12gbc"
base_icon_state = "m12gbc"
ammo_type = /obj/item/ammo_casing/shotgun/meteorslug
code/modules/projectiles/boxes_magazines/external/smg.dm
Vendored
+2 -2
View File
@@ -56,7 +56,7 @@
/obj/item/ammo_box/magazine/smgm9mm
name = "SMG magazine (9mm)"
icon_state = "smg9mm-42"
icon_state = "smg9mm"
base_icon_state = "smg9mm"
ammo_type = /obj/item/ammo_casing/c9mm
caliber = CALIBER_9MM
@@ -64,7 +64,7 @@
/obj/item/ammo_box/magazine/smgm9mm/update_icon_state()
. = ..()
icon_state = "[base_icon_state]-[ammo_count() ? 42 : 0]"
icon_state = "[base_icon_state]-[LAZYLEN(stored_ammo) ? "full" : "empty"]"
/obj/item/ammo_box/magazine/smgm9mm/ap
name = "SMG magazine (Armour Piercing 9mm)"
code/modules/projectiles/boxes_magazines/external/toy.dm
Vendored
+2 -2
View File
@@ -5,14 +5,14 @@
/obj/item/ammo_box/magazine/toy/smg
name = "foam force SMG magazine"
icon_state = "smg9mm-42"
icon_state = "smg9mm"
base_icon_state = "smg9mm"
ammo_type = /obj/item/ammo_casing/caseless/foam_dart
max_ammo = 20
/obj/item/ammo_box/magazine/toy/smg/update_icon_state()
. = ..()
icon_state = "[base_icon_state]-[ammo_count() ? 42 : 0]"
icon_state = "[base_icon_state]-[LAZYLEN(stored_ammo) ? "full" : "empty"]"
/obj/item/ammo_box/magazine/toy/smg/riot
ammo_type = /obj/item/ammo_casing/caseless/foam_dart/riot