Merge pull request #8745 from Cerebulon/gunspritesoct22

Complete gun sprite overhaul + additions
This commit is contained in:
Spookerton
2022-10-13 10:26:30 +01:00
committed by GitHub
23 changed files with 270 additions and 55 deletions
+5 -1
View File
@@ -27,6 +27,10 @@
name = "Pistol Magazine (.45)"
path = /obj/item/ammo_magazine/m45
/datum/uplink_item/item/ammo/c45mcompact
name = "Pistol Magazine (.45 Compact)"
path = /obj/item/ammo_magazine/m45/compact
/datum/uplink_item/item/ammo/c45map
name = "Pistol Magazine (.45 AP)"
path = /obj/item/ammo_magazine/m45/ap
@@ -130,4 +134,4 @@
/datum/uplink_item/item/ammo/cell
name = "weapon cell"
path = /obj/item/cell/device/weapon
path = /obj/item/cell/device/weapon
+6 -1
View File
@@ -138,7 +138,7 @@
name = "Combat Shotgun"
item_cost = 75
path = /obj/item/gun/projectile/shotgun/pump/combat
/datum/uplink_item/item/visible_weapons/semishotgun
name = "Semi-Automatic Shotgun"
item_cost = 100
@@ -154,6 +154,11 @@
item_cost = 30
path = /obj/item/gun/energy/gun/compact
/datum/uplink_item/item/visible_weapons/compact_45
name = "Compact .45 pistol"
item_cost = 40
path = /obj/item/gun/projectile/compact_45
/datum/uplink_item/item/visible_weapons/lasercannon
name = "Laser Cannon"
item_cost = 60