Merge branch 'fatness-change-and-scales' of https://github.com/SomeGuyEatingPie/GS13 into fatness-change-and-scales

This commit is contained in:
SomeGuyEatingPie
2022-08-11 14:10:41 +01:00
69 changed files with 12200 additions and 148769 deletions
-9
View File
@@ -1,9 +0,0 @@
/obj/item/gun/energy/laser/captain
name = "Fat Ray Gun"
icon_state = "fatray"
item_state = "caplaser"
desc = "This is an antique laser gun. All craftsmanship is of the highest quality. It is decorated with assistant leather and chrome. The object menaces with spikes of energy. On the item is an image of Space Station 13. The station is exploding."
force = 10
ammo_x_offset = 3
selfcharge = EGUN_SELFCHARGE
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF
@@ -1,9 +0,0 @@
/obj/item/gun/energy/laser/captain
name = "Fat Ray Gun"
icon_state = "fatray"
item_state = "caplaser"
desc = ""
force = 10
ammo_x_offset = 3
selfcharge = EGUN_SELFCHARGE
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF