Adds new security laser sprites and flavor examine descriptions (#15871)

* Add new security laser and energy gun sprites with flavorful descriptions

* Fix the tesla revolver ammo sprite while I'm here

* Change 1s and 0s to TRUE and FALSE

* fix flashlight x offset and remove unused ammo offset

* remove green flashing lights

* remove green flashing lights from hand sprites
This commit is contained in:
Stokes52
2021-05-04 21:39:54 -04:00
committed by GitHub
parent e444ecbf97
commit 8c20b0aef2
6 changed files with 13 additions and 7 deletions
@@ -1,6 +1,6 @@
/obj/item/gun/energy/laser
name = "laser gun"
desc = "A basic energy-based laser gun that fires concentrated beams of light which pass through glass and thin metal."
desc = "A WT-650 'Sentinel' laser carbine manufactured by Warp-Tac Inc. The golden shield of Nanotrasen Security is visible."
icon_state = "laser"
item_state = "laser"
w_class = WEIGHT_CLASS_NORMAL
@@ -8,7 +8,7 @@
origin_tech = "combat=4;magnets=2"
ammo_type = list(/obj/item/ammo_casing/energy/lasergun)
ammo_x_offset = 1
shaded_charge = 1
shaded_charge = TRUE
/obj/item/gun/energy/laser/practice
name = "practice laser gun"
@@ -1,15 +1,15 @@
/obj/item/gun/energy/gun
name = "energy gun"
desc = "A basic energy-based gun with two settings: kill and disable."
desc = "An E-07 energy gun manufactured by Shellguard Munitions. The fire selector has 'kill' and 'disable' settings."
icon_state = "energy"
item_state = null //so the human update icon uses the icon_state instead.
ammo_type = list(/obj/item/ammo_casing/energy/disabler, /obj/item/ammo_casing/energy/laser)
origin_tech = "combat=4;magnets=3"
modifystate = 2
can_flashlight = 1
ammo_x_offset = 3
flight_x_offset = 15
flight_x_offset = 20
flight_y_offset = 10
shaded_charge = TRUE
/obj/item/gun/energy/gun/cyborg
desc = "An energy-based laser gun that draws power from the cyborg's internal energy cell directly. So this is what freedom looks like?"
@@ -30,6 +30,7 @@
charge_sections = 3
can_flashlight = 0 // Can't attach or detach the flashlight, and override it's icon update
actions_types = list(/datum/action/item_action/toggle_gunlight)
shaded_charge = FALSE
/obj/item/gun/energy/gun/mini/Initialize(mapload, ...)
gun_light = new /obj/item/flashlight/seclite(src)
@@ -51,6 +52,7 @@
ammo_type = list(/obj/item/ammo_casing/energy/electrode/hos, /obj/item/ammo_casing/energy/laser/hos, /obj/item/ammo_casing/energy/disabler)
ammo_x_offset = 4
resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF
shaded_charge = FALSE
/obj/item/gun/energy/gun/blueshield
name = "advanced stun revolver"
@@ -60,7 +62,7 @@
force = 7
ammo_type = list(/obj/item/ammo_casing/energy/electrode/hos, /obj/item/ammo_casing/energy/laser/hos)
ammo_x_offset = 1
shaded_charge = 1
shaded_charge = TRUE
/obj/item/gun/energy/gun/blueshield/pdw9
name = "PDW-9 taser pistol"
@@ -79,6 +81,7 @@
can_flashlight = 0
trigger_guard = TRIGGER_GUARD_NONE
ammo_x_offset = 2
shaded_charge = FALSE
/obj/item/gun/energy/gun/nuclear
name = "advanced energy gun"
@@ -92,3 +95,4 @@
ammo_x_offset = 1
ammo_type = list(/obj/item/ammo_casing/energy/electrode, /obj/item/ammo_casing/energy/laser, /obj/item/ammo_casing/energy/disabler)
selfcharge = 1
shaded_charge = FALSE
+3 -1
View File
@@ -15,7 +15,7 @@
origin_tech = "combat=4;materials=4;powerstorage=4"
ammo_type = list(/obj/item/ammo_casing/energy/shock_revolver)
can_flashlight = 0
shaded_charge = 1
shaded_charge = FALSE
/obj/item/gun/energy/gun/advtaser
name = "hybrid taser"
@@ -24,6 +24,8 @@
ammo_type = list(/obj/item/ammo_casing/energy/electrode, /obj/item/ammo_casing/energy/disabler)
origin_tech = "combat=4"
ammo_x_offset = 2
flight_x_offset = 15
shaded_charge = FALSE
/obj/item/gun/energy/gun/advtaser/cyborg
name = "cyborg taser"