Merge pull request #10075 from Ghommie/Ghommie-cit436

Demodularize defib disks and projectiles icons.
This commit is contained in:
Lin
2019-12-08 20:15:01 +00:00
committed by GitHub
25 changed files with 14 additions and 227 deletions
@@ -36,3 +36,7 @@
/obj/effect/projectile/impact/wormhole
icon_state = "wormhole_g"
/obj/effect/projectile/impact/laser/wavemotion
name = "particle impact"
icon_state = "impact_wavemotion"
@@ -28,3 +28,7 @@
/obj/effect/projectile/muzzle/wormhole
icon_state = "wormhole_g"
/obj/effect/projectile/muzzle/laser/wavemotion
name = "particle backblast"
icon_state = "muzzle_wavemotion"
@@ -66,3 +66,7 @@
/obj/effect/projectile/tracer/wormhole
icon_state = "wormhole_g"
/obj/effect/projectile/tracer/laser/wavemotion
name = "particle trail"
icon_state = "tracer_wavemotion"
+2 -3
View File
@@ -734,9 +734,8 @@
/obj/item/disk/medical
name = "Defibrillator Upgrade Disk"
desc = "A blank upgrade disk, made for a defibrillator"
icon = 'modular_citadel/icons/obj/defib_disks.dmi'
icon_state = "upgrade_disk"
item_state = "heal_disk"
icon_state = "heal_disk"
item_state = "defib_disk"
w_class = WEIGHT_CLASS_SMALL
/obj/item/disk/medical/defib_heal