cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-25 22:12:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Adds a unit test to check for any missing initial icon states (#8332)

Browse Source
This commit is contained in:
mikomyazaki
2020-02-23 02:43:12 -03:00
committed by GitHub
parent bc7286647e
commit 21f348ec57
106 changed files with 214 additions and 304 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/ammunition/boxes.dm
+4 -4
View File
@@ -45,7 +45,7 @@
/obj/item/ammo_magazine/c45x
name = "magazine (.45)"
icon_state = "45x"
icon_state = "45x-16"
origin_tech = list(TECH_COMBAT = 3)
mag_type = MAGAZINE
matter = list(DEFAULT_WALL_MATERIAL = 600)
@@ -56,7 +56,7 @@
/obj/item/ammo_magazine/c45m
name = "magazine (.45)"
icon_state = "45"
icon_state = "45-10"
mag_type = MAGAZINE
ammo_type = /obj/item/ammo_casing/c45
matter = list(DEFAULT_WALL_MATERIAL = 525) //metal costs are very roughly based around 1 .45 casing = 75 metal
@@ -232,7 +232,7 @@
/obj/item/ammo_magazine/trodpack
name = "tungsten rod pack"
icon_state = "trodpack"
icon_state = "trodpack-2"
mag_type = MAGAZINE
caliber = "trod"
ammo_type = /obj/item/ammo_casing/trod
@@ -446,4 +446,4 @@
caliber = "nuke"
ammo_type = /obj/item/ammo_casing/nuke
max_ammo = 2
multiple_sprites = 1
multiple_sprites = 1
code/modules/projectiles/guns/energy/laser.dm
+15 -7
View File
@@ -2,8 +2,8 @@
name = "laser carbine"
desc = "An Hephaestus Industries G40E carbine, designed to kill with concentrated energy blasts."
icon = 'icons/obj/guns/laserrifle.dmi'
icon_state = "laserrifle"
item_state = "laserrifle"
icon_state = "laserrifle100"
item_state = "laserrifle100"
has_item_ratio = FALSE // the back and suit slots have ratio sprites but the in-hands dont
fire_sound = 'sound/weapons/Laser.ogg'
slot_flags = SLOT_BELT|SLOT_BACK
@@ -17,6 +17,8 @@
turret_is_lethal = 1
turret_sprite_set = "laser"
modifystate = "laserrifle"
/obj/item/gun/energy/laser/mounted
name = "mounted laser carbine"
self_recharge = 1
@@ -48,6 +50,8 @@ obj/item/gun/energy/retro
turret_is_lethal = 1
turret_sprite_set = "retro"
modifystate = "retro"
/obj/item/gun/energy/captain
name = "antique laser gun"
icon = 'icons/obj/guns/caplaser.dmi'
@@ -72,8 +76,8 @@ obj/item/gun/energy/retro
desc = "A nanotrasen designed laser cannon capable of acting as a powerful support weapon."
description_fluff = "The NT LC-4 is a laser cannon developed and produced by Nanotrasen. Produced and sold to organizations both in need of a highly powerful support weapon and can afford its high unit cost. In spite of the low capacity, it is a highly capable tool, cutting down fortifications and armored targets with ease."
icon = 'icons/obj/guns/lasercannon.dmi'
icon_state = "lasercannon"
item_state = "lasercannon"
icon_state = "lasercannon100"
item_state = "lasercannon100"
fire_sound = 'sound/weapons/lasercannonfire.ogg'
origin_tech = list(TECH_COMBAT = 4, TECH_MATERIAL = 3, TECH_POWER = 3)
slot_flags = SLOT_BELT|SLOT_BACK
@@ -85,6 +89,8 @@ obj/item/gun/energy/retro
turret_is_lethal = 1
turret_sprite_set = "cannon"
modifystate = "lasercannon"
/obj/item/gun/energy/lasercannon/mounted
name = "mounted laser cannon"
self_recharge = 1
@@ -164,8 +170,8 @@ obj/item/gun/energy/retro
desc = "A Nanotrasen designed laser weapon, designed to split a single beam four times."
description_fluff = "The NT QB-2 is a laser weapon developed and produced by Nanotrasen. Designed to fill in the niche that ballistic shotguns do, but in the form of laser weaponry. It is equipped with a special crystal lens that splits a single laser beam into four."
icon = 'icons/obj/guns/ecarbine.dmi' // using this as placeholder until proper sprites are made
icon_state = "energykill"
item_state = "energykill"
icon_state = "energykill100"
item_state = "energykill100"
fire_sound = 'sound/weapons/Laser.ogg'
slot_flags = SLOT_BELT|SLOT_BACK
w_class = 3
@@ -185,6 +191,8 @@ obj/item/gun/energy/retro
turret_is_lethal = 1
turret_sprite_set = "laser"
modifystate = "energykill"
////////Laser Tag////////////////////
/obj/item/gun/energy/lasertag
@@ -226,4 +234,4 @@ obj/item/gun/energy/retro
pin = /obj/item/device/firing_pin/tag/red
can_turret = 1
turret_is_lethal = 0
turret_sprite_set = "red"
turret_sprite_set = "red"
code/modules/projectiles/guns/energy/magic.dm
+3 -3
View File
@@ -146,7 +146,7 @@ obj/item/gun/energy/staff/focus/attack_self(mob/living/user as mob)
/obj/item/gun/energy/staff/chaos
name = "staff of chaos"
desc = "An artefact that spits bolts of chaotic energy, expect anything."
icon = 'icons/obj/wands.dmi'
icon = 'icons/obj/guns/staff_of_chaos.dmi'
icon_state = "staffofchaos"
item_state = "staffofchaos"
fire_sound = 'sound/magic/Staff_Chaos.ogg'
@@ -194,7 +194,7 @@ obj/item/gun/energy/staff/focus/attack_self(mob/living/user as mob)
pin = /obj/item/device/firing_pin/magic
charge_failure_message = null
has_safety = FALSE
/obj/item/gun/energy/wand/get_cell()
return DEVICE_NO_CELL
@@ -346,4 +346,4 @@ obj/item/gun/energy/staff/focus/attack_self(mob/living/user as mob)
H.drop_item()
qdel(src)
return 0
return 1
return 1
code/modules/projectiles/guns/energy/modular.dm
+3 -1
View File
@@ -2,6 +2,8 @@
name = "laser prototype"
desc = "A custom prototype laser weapon."
icon = 'icons/obj/guns/modular_laser.dmi'
icon_state = "large_3"
item_state = "large_3"
contained_sprite = TRUE
has_icon_ratio = FALSE
has_item_ratio = FALSE
@@ -323,4 +325,4 @@
desc = input
to_chat(M, "You describe the gun as [input]. Say hello to your new friend.")
described = 1
return 1
return 1
code/modules/projectiles/guns/energy/nuclear.dm
+7 -7
View File
@@ -3,8 +3,8 @@
desc = "A Nanotrasen designed energy-based carbine with two settings: Stun and kill."
description_fluff = "The NT EC-4 is an energy carbine developed and produced by Nanotrasen. Compact, light and durable, used by security forces and law enforcement for its ability to fire stun or lethal beams, depending on selection. It is widely sold and distributed across the galaxy."
icon = 'icons/obj/guns/ecarbine.dmi'
icon_state = "energystun"
item_state = "energystun"
icon_state = "energystun100"
item_state = "energystun100"
fire_sound = 'sound/weapons/Taser.ogg'
slot_flags = SLOT_BELT
accuracy = 1
@@ -121,8 +121,8 @@
desc = "A Nanotrasen energy-based pistol gun with two settings: Stun and kill."
description_fluff = "The NT EP-3 is an energy sidearm developed and produced by Nanotrasen. Compact, light and durable, used by security forces and law enforcement for its ability to fire stun or lethal beams, depending on selection. It is widely sold and distributed across the galaxy."
icon = 'icons/obj/guns/epistol.dmi'
icon_state = "epistolstun"
item_state = "epistolstun"
icon_state = "epistolstun100"
item_state = "epistolstun100"
fire_sound = 'sound/weapons/Taser.ogg'
slot_flags = SLOT_BELT|SLOT_HOLSTER
max_shots = 7
@@ -159,12 +159,12 @@
secondary_projectile_type = /obj/item/projectile/beam/pistol/hegemony
secondary_fire_sound = 'sound/weapons/Laser.ogg'
can_switch_modes = TRUE
projectile_type = /obj/item/projectile/beam/stun
origin_tech = list(TECH_COMBAT = 4, TECH_MAGNET = 3)
modifystate = "hegemony_pistol"
firemodes = list(
list(mode_name="incapacitate", projectile_type=/obj/item/projectile/beam/stun, modifystate="hegemony_pistol", fire_sound='sound/weapons/Taser.ogg'),
list(mode_name="smite", projectile_type=/obj/item/projectile/beam/pistol/hegemony, modifystate="hegemony_pistol", fire_sound='sound/weapons/Laser.ogg')
)
)
code/modules/projectiles/guns/energy/rifle.dm
+7 -5
View File
@@ -3,8 +3,8 @@
desc = "A Nanotrasen designed energy-based rifle with two settings: Stun and Kill."
description_fluff = "The NT ER-2 is an energy rifle developed and produced by Nanotrasen. Widely produced and sold across the galaxy. Designed to both stun and kill with concentrated energy blasts of varying strengths based on the fire mode, focused through a crystal lens. Considered to be a dual-purpose rifle with prolonged combat capability."
icon = 'icons/obj/guns/erifle.dmi'
icon_state = "eriflestun"
icon_state = "eriflestun"
icon_state = "eriflestun100"
icon_state = "eriflestun100"
fire_sound = 'sound/weapons/Taser.ogg'
slot_flags = SLOT_BACK
w_class = 4
@@ -70,8 +70,8 @@
desc = "A nanotrasen designed laser cannon capable of acting as a powerful support weapon."
description_fluff = "The NT LC-4 is a laser cannon developed and produced by Nanotrasen. Produced and sold to organizations both in need of a highly powerful support weapon and can afford its high unit cost. In spite of the low capacity, it is a highly capable tool, cutting down fortifications and armored targets with ease."
icon = 'icons/obj/guns/lasercannon.dmi'
icon_state = "lasercannon"
item_state = "lasercannon"
icon_state = "lasercannon100"
item_state = "lasercannon100"
has_item_ratio = TRUE
fire_sound = 'sound/weapons/lasercannonfire.ogg'
projectile_type = /obj/item/projectile/beam/heavylaser
@@ -86,6 +86,8 @@
turret_sprite_set = "cannon"
turret_is_lethal = 1
modifystate = "lasercannon"
accuracy_wielded = 2
fire_delay_wielded = 20
@@ -169,4 +171,4 @@
if(wielded)
toggle_scope(2.0, usr)
else
to_chat(usr, "<span class='warning'>You can't look through the scope without stabilizing the rifle!</span>")
to_chat(usr, "<span class='warning'>You can't look through the scope without stabilizing the rifle!</span>")
code/modules/projectiles/modular/laser_base.dm
+7 -7
View File
@@ -1,6 +1,6 @@
/obj/item/laser_components
icon = 'icons/obj/guns/modular_laser.dmi'
icon_state = "bfg"
var/base_icon_state = "bfg"
contained_sprite = TRUE
var/reliability = 0
var/damage = 1
@@ -69,7 +69,7 @@
/obj/item/laser_components/capacitor
name = "capacitor"
desc = "A basic laser weapon capacitor."
icon_state = "capacitor"
base_icon_state = "capacitor"
shots = 5
damage = 10
reliability = 50
@@ -104,7 +104,7 @@
/obj/item/laser_components/focusing_lens
name = "focusing lens"
desc = "A basic laser weapon focusing lens."
icon_state = "lens"
base_icon_state = "lens"
var/list/dispersion = list(0.6,1.0,1.0,1.0,1.2,0.6,1.0,1.0,1.0,1.2,0.6,1.0,1.0,1.0,1.2,0.6,1.0,1.0,1.0,1.2)
reliability = 25
repair_item = /obj/item/stack/nanopaste
@@ -128,7 +128,7 @@
/obj/item/laser_components/modulator
name = "laser modulator"
desc = "A modification that modulates the beam into a standard laser beam."
icon_state = "laser"
base_icon_state = "laser"
origin_tech = list(TECH_COMBAT = 1, TECH_MAGNET = 2)
var/obj/item/projectile/beam/projectile = /obj/item/projectile/beam
var/firing_sound = 'sound/weapons/Laser.ogg'
@@ -141,7 +141,7 @@
desc = "A case for shoving things into. Hopefully they work."
w_class = 2
icon = 'icons/obj/guns/modular_laser.dmi'
icon_state = "small"
var/base_icon_state = "small"
contained_sprite = TRUE
var/stage = 1
var/size = CHASSIS_SMALL
@@ -183,7 +183,7 @@
/obj/item/device/laser_assembly/update_icon()
..()
underlays.Cut()
icon_state = "[initial(icon_state)]_[stage]"
icon_state = "[base_icon_state]_[stage]"
if(gun_mods.len)
for(var/obj/item/laser_components/mod in gun_mods)
if(mod.gun_overlay)
@@ -217,4 +217,4 @@
gun_mods = null
focusing_lens = null
capacitor = null
qdel(src)
qdel(src)
code/modules/projectiles/modular/laser_components.dm
+3 -3
View File
@@ -2,21 +2,21 @@
/obj/item/device/laser_assembly/medium
name = "laser assembly (medium)"
icon_state = "medium"
base_icon_state = "medium"
w_class = 3
size = CHASSIS_MEDIUM
modifier_cap = 4
/obj/item/device/laser_assembly/large
name = "laser assembly (large)"
icon_state = "large"
base_icon_state = "large"
w_class = 4
size = CHASSIS_LARGE
modifier_cap = 5
/obj/item/device/laser_assembly/admin
name = "laser assembly (obscene)"
icon_state = "large"
base_icon_state = "large"
w_class = 4
size = CHASSIS_LARGE
modifier_cap = 25
code/modules/projectiles/projectile/beams.dm
+6 -5
View File
@@ -29,10 +29,11 @@
damage = 35
/obj/item/projectile/beam/pistol/hegemony
icon_state = "hegemony"
icon = 'icons/obj/guns/hegemony_pistol.dmi'
icon_state = "hegemony_pistol"
damage = 30
armor_penetration = 5
muzzle_type = /obj/effect/projectile/muzzle/hegemony
tracer_type = /obj/effect/projectile/tracer/hegemony
impact_type = /obj/effect/projectile/impact/hegemony
@@ -289,7 +290,7 @@
/obj/item/projectile/beam/megaglaive
name = "thermal lance"
icon_state = "megaglaive"
icon_state = "gauss"
damage = 10
incinerate = 5
armor_penetration = 10
@@ -318,7 +319,7 @@
/obj/item/projectile/beam/thermaldrill
name = "thermal drill"
icon_state = "megaglaive"
icon_state = "gauss"
damage = 1
no_attack_log = 1
@@ -406,4 +407,4 @@
muzzle_type = /obj/effect/projectile/muzzle/tachyon
tracer_type = /obj/effect/projectile/tracer/tachyon
impact_type = /obj/effect/projectile/impact/tachyon
impact_type = /obj/effect/projectile/impact/tachyon