cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-23 03:57:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

refactor: rename action button appearance related variables and procs to be clearer (#25658)

Browse Source 
* refactor: make action appearance creation more straightforward

* some adjustments

* fix: adjust action icons to refactor
This commit is contained in:
Gaxeer
2024-07-01 02:29:31 +00:00
committed by GitHub
parent 49599aa2f6
commit 32e46c02aa
88 changed files with 357 additions and 350 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/brain/MMI.dm
+3 -3
View File
@@ -212,9 +212,9 @@
mmi = null
return ..()
/datum/action/generic/configure_mmi_radio/ApplyIcon(atom/movable/screen/movable/action_button/current_button)
icon_icon = mmi.icon
button_icon_state = mmi.icon_state
/datum/action/generic/configure_mmi_radio/apply_button_overlay(atom/movable/screen/movable/action_button/current_button)
button_overlay_icon = mmi.icon
button_overlay_icon_state = mmi.icon_state
..()
/obj/item/mmi/emp_act(severity)
code/modules/mob/living/carbon/human/species/golem.dm
+3 -3
View File
@@ -155,7 +155,7 @@
name = "Ignite"
desc = "Set yourself aflame, bringing yourself closer to exploding!"
check_flags = AB_CHECK_CONSCIOUS
button_icon_state = "sacredflame"
button_overlay_icon_state = "sacredflame"
/datum/action/innate/golem_ignite/Activate()
if(ishuman(owner))
@@ -498,8 +498,8 @@
/datum/action/innate/unstable_teleport
name = "Unstable Teleport"
check_flags = AB_CHECK_CONSCIOUS
button_icon_state = "blink"
icon_icon = 'icons/mob/actions/actions.dmi'
button_overlay_icon_state = "blink"
button_overlay_icon = 'icons/mob/actions/actions.dmi'
var/activated = FALSE // To prevent spamming
var/cooldown = 150
var/last_teleport = 0
code/modules/mob/living/carbon/human/species/machine.dm
+1 -1
View File
@@ -138,7 +138,7 @@
/datum/action/innate/change_monitor
name = "Change Monitor"
check_flags = AB_CHECK_CONSCIOUS
button_icon_state = "scan_mode"
button_overlay_icon_state = "scan_mode"
/datum/action/innate/change_monitor/Activate()
var/mob/living/carbon/human/H = owner
code/modules/mob/living/carbon/human/species/moth.dm
+2 -2
View File
@@ -158,8 +158,8 @@
name = "Cocoon"
desc = "Restore your wings and antennae, and heal some damage. If your cocoon is broken externally you will take heavy damage!"
check_flags = AB_CHECK_RESTRAINED|AB_CHECK_STUNNED|AB_CHECK_CONSCIOUS|AB_CHECK_TURF
icon_icon = 'icons/effects/effects.dmi'
button_icon_state = "cocoon1"
button_overlay_icon = 'icons/effects/effects.dmi'
button_overlay_icon_state = "cocoon1"
/datum/action/innate/cocoon/Activate()
var/mob/living/carbon/human/moth/H = owner
code/modules/mob/living/carbon/human/species/slimepeople.dm
+4 -4
View File
@@ -110,8 +110,8 @@
/datum/action/innate/slimecolor
name = "Toggle Recolor"
check_flags = AB_CHECK_CONSCIOUS
icon_icon = 'icons/effects/effects.dmi'
button_icon_state = "greenglow"
button_overlay_icon = 'icons/effects/effects.dmi'
button_overlay_icon_state = "greenglow"
/datum/action/innate/slimecolor/Activate()
var/mob/living/carbon/human/H = owner
@@ -126,8 +126,8 @@
/datum/action/innate/regrow
name = "Regrow limbs"
check_flags = AB_CHECK_CONSCIOUS
icon_icon = 'icons/effects/effects.dmi'
button_icon_state = "greenglow"
button_overlay_icon = 'icons/effects/effects.dmi'
button_overlay_icon_state = "greenglow"
/datum/action/innate/regrow/Activate()
var/mob/living/carbon/human/H = owner
code/modules/mob/living/carbon/human/species/unathi.dm
+2 -2
View File
@@ -75,8 +75,8 @@
/datum/action/innate/unathi_ignite
name = "Ignite"
desc = "A fire forms in your mouth, fierce enough to... light a cigarette. Requires you to drink welding fuel beforehand."
icon_icon = 'icons/obj/cigarettes.dmi'
button_icon_state = "match_unathi"
button_overlay_icon = 'icons/obj/cigarettes.dmi'
button_overlay_icon_state = "match_unathi"
var/cooldown = 0
var/cooldown_duration = 20 SECONDS
var/welding_fuel_used = 3 //one sip, with less strict timing
code/modules/mob/living/silicon/robot/robot_module_actions.dm
+12 -12
View File
@@ -1,7 +1,7 @@
/datum/action/innate/robot_sight
var/sight_mode = null
icon_icon = 'icons/obj/decals.dmi'
button_icon_state = "securearea"
button_overlay_icon = 'icons/obj/decals.dmi'
button_overlay_icon_state = "securearea"
/datum/action/innate/robot_sight/Activate()
var/mob/living/silicon/robot/R = owner
@@ -22,24 +22,24 @@
/datum/action/innate/robot_sight/thermal
name = "Thermal Vision"
sight_mode = BORGTHERM
icon_icon = 'icons/obj/clothing/glasses.dmi'
button_icon_state = "thermal"
button_overlay_icon = 'icons/obj/clothing/glasses.dmi'
button_overlay_icon_state = "thermal"
// ayylmao
/datum/action/innate/robot_sight/thermal/alien
icon_icon = 'icons/mob/alien.dmi'
button_icon_state = "borg-extra-vision"
button_overlay_icon = 'icons/mob/alien.dmi'
button_overlay_icon_state = "borg-extra-vision"
/datum/action/innate/robot_sight/meson
name = "Meson Vision"
sight_mode = BORGMESON
icon_icon = 'icons/obj/clothing/glasses.dmi'
button_icon_state = "meson"
button_overlay_icon = 'icons/obj/clothing/glasses.dmi'
button_overlay_icon_state = "meson"
/datum/action/innate/robot_magpulse
name = "Magnetic pulse"
icon_icon = 'icons/obj/clothing/shoes.dmi'
button_icon_state = "magboots0"
button_overlay_icon = 'icons/obj/clothing/shoes.dmi'
button_overlay_icon_state = "magboots0"
var/slowdown_active = 2 // Same as magboots
/datum/action/innate/robot_magpulse/Activate()
@@ -47,7 +47,7 @@
to_chat(owner, "You turn your magboots on.")
var/mob/living/silicon/robot/robot = owner
robot.speed += slowdown_active
button_icon_state = "magboots1"
button_overlay_icon_state = "magboots1"
active = TRUE
/datum/action/innate/robot_magpulse/Deactivate()
@@ -55,5 +55,5 @@
to_chat(owner, "You turn your magboots off.")
var/mob/living/silicon/robot/robot = owner
robot.speed -= slowdown_active
button_icon_state = initial(button_icon_state)
button_overlay_icon_state = initial(button_overlay_icon_state)
active = FALSE
code/modules/mob/living/simple_animal/friendly/diona_nymph.dm
+6 -6
View File
@@ -56,8 +56,8 @@
/datum/action/innate/diona/merge
name = "Merge with gestalt"
icon_icon = 'icons/mob/human_races/r_diona.dmi'
button_icon_state = "preview"
button_overlay_icon = 'icons/mob/human_races/r_diona.dmi'
button_overlay_icon_state = "preview"
/datum/action/innate/diona/merge/Activate()
var/mob/living/simple_animal/diona/user = owner
@@ -65,8 +65,8 @@
/datum/action/innate/diona/evolve
name = "Evolve"
icon_icon = 'icons/obj/cloning.dmi'
button_icon_state = "pod_cloning"
button_overlay_icon = 'icons/obj/cloning.dmi'
button_overlay_icon_state = "pod_cloning"
/datum/action/innate/diona/evolve/Activate()
var/mob/living/simple_animal/diona/user = owner
@@ -74,8 +74,8 @@
/datum/action/innate/diona/steal_blood
name = "Steal blood"
icon_icon = 'icons/goonstation/objects/iv.dmi'
button_icon_state = "bloodbag"
button_overlay_icon = 'icons/goonstation/objects/iv.dmi'
button_overlay_icon_state = "bloodbag"
/datum/action/innate/diona/steal_blood/Activate()
var/mob/living/simple_animal/diona/user = owner
code/modules/mob/living/simple_animal/friendly/nian_caterpillar.dm
+2 -2
View File
@@ -128,8 +128,8 @@
/datum/action/innate/nian_caterpillar_emerge
name = "Evolve"
desc = "Weave a cocoon around yourself to evolve into a greater form. The worme."
icon_icon = 'icons/effects/effects.dmi'
button_icon_state = "cocoon1"
button_overlay_icon = 'icons/effects/effects.dmi'
button_overlay_icon_state = "cocoon1"
/datum/action/innate/nian_caterpillar_emerge/proc/emerge(obj/structure/moth/cocoon/C)
for(var/mob/living/carbon/human/H in C)
code/modules/mob/living/simple_animal/hide_action.dm
+4 -4
View File
@@ -4,7 +4,7 @@
var/layer_to_change_from = MOB_LAYER
var/layer_to_change_to = TURF_LAYER + 0.2
check_flags = AB_CHECK_CONSCIOUS
button_icon_state = "mouse_gray_sleep"
button_overlay_icon_state = "mouse_gray_sleep"
/datum/action/innate/hide/Activate()
var/mob/living/simple_animal/simplemob = owner
@@ -23,10 +23,10 @@
/datum/action/innate/hide/alien_larva_hide
desc = "Allows to hide beneath tables or certain items. Toggled on or off."
background_icon_state = "bg_alien"
button_icon_state = "alien_hide"
button_background_icon_state = "bg_alien"
button_overlay_icon_state = "alien_hide"
layer_to_change_to = ABOVE_NORMAL_TURF_LAYER
layer_to_change_from = MOB_LAYER
/datum/action/innate/hide/drone_hide
button_icon_state = "repairbot"
button_overlay_icon_state = "repairbot"
code/modules/mob/living/simple_animal/hostile/giant_spider.dm
+6 -6
View File
@@ -163,8 +163,8 @@
/datum/action/innate/web_giant_spider
name = "Lay Web"
icon_icon = 'icons/effects/effects.dmi'
button_icon_state = "stickyweb1"
button_overlay_icon = 'icons/effects/effects.dmi'
button_overlay_icon_state = "stickyweb1"
/datum/action/innate/web_giant_spider/Activate()
var/mob/living/simple_animal/hostile/poison/giant_spider/user = owner
@@ -172,8 +172,8 @@
/datum/action/innate/wrap_giant_spider
name = "Wrap"
icon_icon = 'icons/effects/effects.dmi'
button_icon_state = "cocoon_large1"
button_overlay_icon = 'icons/effects/effects.dmi'
button_overlay_icon_state = "cocoon_large1"
/datum/action/innate/wrap_giant_spider/Activate()
var/mob/living/simple_animal/hostile/poison/giant_spider/nurse/user = owner
@@ -181,8 +181,8 @@
/datum/action/innate/lay_eggs_giant_spider
name = "Lay Eggs"
icon_icon = 'icons/effects/effects.dmi'
button_icon_state = "eggs"
button_overlay_icon = 'icons/effects/effects.dmi'
button_overlay_icon_state = "eggs"
/datum/action/innate/lay_eggs_giant_spider/Activate()
var/mob/living/simple_animal/hostile/poison/giant_spider/nurse/user = owner
code/modules/mob/living/simple_animal/hostile/gorilla/gorilla.dm
+2 -2
View File
@@ -57,8 +57,8 @@
/datum/action/innate/gorilla/gorilla_toggle
name = "Toggle Stand"
desc = "Toggles between crawling and standing up."
icon_icon = 'icons/mob/actions/actions_animal.dmi'
button_icon_state = "gorilla_toggle"
button_overlay_icon = 'icons/mob/actions/actions_animal.dmi'
button_overlay_icon_state = "gorilla_toggle"
check_flags = AB_CHECK_CONSCIOUS
/datum/action/innate/gorilla/gorilla_toggle/Activate()
code/modules/mob/living/simple_animal/hostile/megafauna/blood_drunk_miner.dm
+6 -6
View File
@@ -73,22 +73,22 @@ Difficulty: Medium
/datum/action/innate/megafauna_attack/dash
name = "Dash To Target"
icon_icon = 'icons/mob/actions/actions.dmi'
button_icon_state = "sniper_zoom"
button_overlay_icon = 'icons/mob/actions/actions.dmi'
button_overlay_icon_state = "sniper_zoom"
chosen_message = "<span class='colossus'>You are now dashing to your target.</span>"
chosen_attack_num = 1
/datum/action/innate/megafauna_attack/kinetic_accelerator
name = "Fire Kinetic Accelerator"
icon_icon = 'icons/obj/guns/energy.dmi'
button_icon_state = "kineticgun"
button_overlay_icon = 'icons/obj/guns/energy.dmi'
button_overlay_icon_state = "kineticgun"
chosen_message = "<span class='colossus'>You are now shooting your kinetic accelerator.</span>"
chosen_attack_num = 2
/datum/action/innate/megafauna_attack/transform_weapon
name = "Transform Weapon"
icon_icon = 'icons/obj/lavaland/artefacts.dmi'
button_icon_state = "cleaving_saw"
button_overlay_icon = 'icons/obj/lavaland/artefacts.dmi'
button_overlay_icon_state = "cleaving_saw"
chosen_message = "<span class='colossus'>You are now transforming your weapon.</span>"
chosen_attack_num = 3
code/modules/mob/living/simple_animal/hostile/megafauna/bubblegum.dm
+8 -8
View File
@@ -92,29 +92,29 @@ Difficulty: Hard
/datum/action/innate/megafauna_attack/triple_charge
name = "Triple Charge"
icon_icon = 'icons/mob/actions/actions.dmi'
button_icon_state = "sniper_zoom"
button_overlay_icon = 'icons/mob/actions/actions.dmi'
button_overlay_icon_state = "sniper_zoom"
chosen_message = "<span class='colossus'>You are now triple charging at the target you click on.</span>"
chosen_attack_num = 1
/datum/action/innate/megafauna_attack/hallucination_charge
name = "Hallucination Charge"
icon_icon = 'icons/effects/bubblegum.dmi'
button_icon_state = "smack ya one"
button_overlay_icon = 'icons/effects/bubblegum.dmi'
button_overlay_icon_state = "smack ya one"
chosen_message = "<span class='colossus'>You are now charging with hallucinations at the target you click on.</span>"
chosen_attack_num = 2
/datum/action/innate/megafauna_attack/hallucination_surround
name = "Surround Target"
icon_icon = 'icons/turf/walls/wall.dmi'
button_icon_state = "wall-0"
button_overlay_icon = 'icons/turf/walls/wall.dmi'
button_overlay_icon_state = "wall-0"
chosen_message = "<span class='colossus'>You are now surrounding the target you click on with hallucinations.</span>"
chosen_attack_num = 3
/datum/action/innate/megafauna_attack/blood_warp
name = "Blood Warp"
icon_icon = 'icons/effects/blood.dmi'
button_icon_state = "floor1"
button_overlay_icon = 'icons/effects/blood.dmi'
button_overlay_icon_state = "floor1"
chosen_message = "<span class='colossus'>You are now warping to blood around your clicked position.</span>"
chosen_attack_num = 4
code/modules/mob/living/simple_animal/hostile/megafauna/colossus.dm
+8 -8
View File
@@ -73,29 +73,29 @@ Difficulty: Very Hard
/datum/action/innate/megafauna_attack/spiral_attack
name = "Spiral Shots"
icon_icon = 'icons/mob/actions/actions.dmi'
button_icon_state = "sniper_zoom"
button_overlay_icon = 'icons/mob/actions/actions.dmi'
button_overlay_icon_state = "sniper_zoom"
chosen_message = "<span class='colossus'>You are now firing in a spiral.</span>"
chosen_attack_num = 1
/datum/action/innate/megafauna_attack/aoe_attack
name = "All Directions"
icon_icon = 'icons/effects/effects.dmi'
button_icon_state = "at_shield2"
button_overlay_icon = 'icons/effects/effects.dmi'
button_overlay_icon_state = "at_shield2"
chosen_message = "<span class='colossus'>You are now firing in all directions.</span>"
chosen_attack_num = 2
/datum/action/innate/megafauna_attack/shotgun
name = "Shotgun Fire"
icon_icon = 'icons/obj/guns/projectile.dmi'
button_icon_state = "shotgun"
button_overlay_icon = 'icons/obj/guns/projectile.dmi'
button_overlay_icon_state = "shotgun"
chosen_message = "<span class='colossus'>You are now firing shotgun shots where you aim.</span>"
chosen_attack_num = 3
/datum/action/innate/megafauna_attack/alternating_cardinals
name = "Alternating Shots"
icon_icon = 'icons/obj/guns/projectile.dmi'
button_icon_state = "pistol"
button_overlay_icon = 'icons/obj/guns/projectile.dmi'
button_overlay_icon_state = "pistol"
chosen_message = "<span class='colossus'>You are now firing in alternating cardinal directions.</span>"
chosen_attack_num = 4
code/modules/mob/living/simple_animal/hostile/megafauna/drake.dm
+8 -8
View File
@@ -69,29 +69,29 @@ Difficulty: Medium
/datum/action/innate/megafauna_attack/fire_cone
name = "Fire Cone"
icon_icon = 'icons/obj/wizard.dmi'
button_icon_state = "fireball"
button_overlay_icon = 'icons/obj/wizard.dmi'
button_overlay_icon_state = "fireball"
chosen_message = "<span class='colossus'>You are now shooting fire at your target.</span>"
chosen_attack_num = 1
/datum/action/innate/megafauna_attack/fire_cone_meteors
name = "Fire Cone With Meteors"
icon_icon = 'icons/mob/actions/actions.dmi'
button_icon_state = "sniper_zoom"
button_overlay_icon = 'icons/mob/actions/actions.dmi'
button_overlay_icon_state = "sniper_zoom"
chosen_message = "<span class='colossus'>You are now shooting fire at your target and raining fire around you.</span>"
chosen_attack_num = 2
/datum/action/innate/megafauna_attack/mass_fire
name = "Mass Fire Attack"
icon_icon = 'icons/effects/fire.dmi'
button_icon_state = "1"
button_overlay_icon = 'icons/effects/fire.dmi'
button_overlay_icon_state = "1"
chosen_message = "<span class='colossus'>You are now shooting mass fire at your target.</span>"
chosen_attack_num = 3
/datum/action/innate/megafauna_attack/lava_swoop
name = "Lava Swoop"
icon_icon = 'icons/effects/effects.dmi'
button_icon_state = "lavastaff_warn"
button_overlay_icon = 'icons/effects/effects.dmi'
button_overlay_icon_state = "lavastaff_warn"
chosen_message = "<span class='colossus'>You are now swooping and raining lava at your target.</span>"
chosen_attack_num = 4
code/modules/mob/living/simple_animal/hostile/megafauna/hierophant.dm
+8 -8
View File
@@ -92,29 +92,29 @@ Difficulty: Hard
/datum/action/innate/megafauna_attack/blink
name = "Blink To Target"
icon_icon = 'icons/mob/actions/actions.dmi'
button_icon_state = "sniper_zoom"
button_overlay_icon = 'icons/mob/actions/actions.dmi'
button_overlay_icon_state = "sniper_zoom"
chosen_message = "<span class='colossus'>You are now blinking to your target.</span>"
chosen_attack_num = 1
/datum/action/innate/megafauna_attack/chaser_swarm
name = "Chaser Swarm"
icon_icon = 'icons/effects/effects.dmi'
button_icon_state = "hierophant_squares_indefinite"
button_overlay_icon = 'icons/effects/effects.dmi'
button_overlay_icon_state = "hierophant_squares_indefinite"
chosen_message = "<span class='colossus'>You are firing a chaser swarm at your target.</span>"
chosen_attack_num = 2
/datum/action/innate/megafauna_attack/cross_blasts
name = "Cross Blasts"
icon_icon = 'icons/effects/effects.dmi'
button_icon_state = "hierophant_blast_indefinite"
button_overlay_icon = 'icons/effects/effects.dmi'
button_overlay_icon_state = "hierophant_blast_indefinite"
chosen_message = "<span class='colossus'>You are now firing cross blasts at your target.</span>"
chosen_attack_num = 3
/datum/action/innate/megafauna_attack/blink_spam
name = "Blink Chase"
icon_icon = 'icons/obj/lavaland/artefacts.dmi'
button_icon_state = "hierophant_club_ready_beacon"
button_overlay_icon = 'icons/obj/lavaland/artefacts.dmi'
button_overlay_icon_state = "hierophant_club_ready_beacon"
chosen_message = "<span class='colossus'>You are now repeatedly blinking at your target.</span>"
chosen_attack_num = 4
code/modules/mob/living/simple_animal/hostile/megafauna/megafauna.dm
+2 -2
View File
@@ -160,8 +160,8 @@
/datum/action/innate/megafauna_attack
name = "Megafauna Attack"
icon_icon = 'icons/mob/actions/actions_animal.dmi'
button_icon_state = ""
button_overlay_icon = 'icons/mob/actions/actions_animal.dmi'
button_overlay_icon_state = ""
var/mob/living/simple_animal/hostile/megafauna/M
var/chosen_message
var/chosen_attack_num = 0
code/modules/mob/living/simple_animal/hostile/mining/elites/elite.dm
+3 -3
View File
@@ -103,9 +103,9 @@ While using this makes the system rely on OnFire, it still gives options for tim
/datum/action/innate/elite_attack
name = "Elite Attack"
icon_icon = 'icons/mob/actions/actions_elites.dmi'
button_icon_state = ""
background_icon_state = "bg_default"
button_overlay_icon = 'icons/mob/actions/actions_elites.dmi'
button_overlay_icon_state = ""
button_background_icon_state = "bg_default"
///The displayed message into chat when this attack is selected
var/chosen_message
///The internal attack ID for the elite's OpenFire() proc to use
code/modules/mob/living/simple_animal/hostile/mining/elites/goliath_broodmother.dm
+4 -4
View File
@@ -50,25 +50,25 @@
/datum/action/innate/elite_attack/tentacle_patch
name = "Tentacle Patch"
button_icon_state = "tentacle_patch"
button_overlay_icon_state = "tentacle_patch"
chosen_message = "<span class='boldwarning'>You are now attacking with a patch of tentacles.</span>"
chosen_attack_num = TENTACLE_PATCH
/datum/action/innate/elite_attack/spawn_children
name = "Spawn Children"
button_icon_state = "spawn_children"
button_overlay_icon_state = "spawn_children"
chosen_message = "<span class='boldwarning'>You will spawn two children at your location to assist you in combat. You can have up to 8.</span>"
chosen_attack_num = SPAWN_CHILDREN
/datum/action/innate/elite_attack/rage
name = "Rage"
button_icon_state = "rage"
button_overlay_icon_state = "rage"
chosen_message = "<span class='boldwarning'>You will temporarily increase your movement speed.</span>"
chosen_attack_num = RAGE
/datum/action/innate/elite_attack/call_children
name = "Call Children"
button_icon_state = "call_children"
button_overlay_icon_state = "call_children"
chosen_message = "<span class='boldwarning'>You will summon your children to your location.</span>"
chosen_attack_num = CALL_CHILDREN
code/modules/mob/living/simple_animal/hostile/mining/elites/herald.dm
+4 -4
View File
@@ -73,25 +73,25 @@
/datum/action/innate/elite_attack/herald_trishot
name = "Triple Shot"
button_icon_state = "herald_trishot"
button_overlay_icon_state = "herald_trishot"
chosen_message = "<span class='boldwarning'>You are now firing three shots in your chosen direction.</span>"
chosen_attack_num = HERALD_TRISHOT
/datum/action/innate/elite_attack/herald_directionalshot
name = "Circular Shot"
button_icon_state = "herald_directionalshot"
button_overlay_icon_state = "herald_directionalshot"
chosen_message = "<span class='boldwarning'>You are firing projectiles in all directions.</span>"
chosen_attack_num = HERALD_DIRECTIONALSHOT
/datum/action/innate/elite_attack/herald_teleshot
name = "Teleport Shot"
button_icon_state = "herald_teleshot"
button_overlay_icon_state = "herald_teleshot"
chosen_message = "<span class='boldwarning'>You will now fire a shot which teleports you where it lands.</span>"
chosen_attack_num = HERALD_TELESHOT
/datum/action/innate/elite_attack/herald_mirror
name = "Summon Mirror"
button_icon_state = "herald_mirror"
button_overlay_icon_state = "herald_mirror"
chosen_message = "<span class='boldwarning'>You will spawn a mirror which duplicates your attacks.</span>"
chosen_attack_num = HERALD_MIRROR
code/modules/mob/living/simple_animal/hostile/mining/elites/legionnaire.dm
+4 -4
View File
@@ -54,25 +54,25 @@
/datum/action/innate/elite_attack/legionnaire_charge
name = "Legionnaire Charge"
button_icon_state = "legionnaire_charge"
button_overlay_icon_state = "legionnaire_charge"
chosen_message = "<span class='boldwarning'>You will attempt to grab your opponent and throw them.</span>"
chosen_attack_num = LEGIONNAIRE_CHARGE
/datum/action/innate/elite_attack/head_detach
name = "Release Head"
button_icon_state = "head_detach"
button_overlay_icon_state = "head_detach"
chosen_message = "<span class='boldwarning'>You will now detach your head or kill it if it is already released.</span>"
chosen_attack_num = HEAD_DETACH
/datum/action/innate/elite_attack/bonfire_teleport
name = "Bonfire Teleport"
button_icon_state = "bonfire_teleport"
button_overlay_icon_state = "bonfire_teleport"
chosen_message = "<span class='boldwarning'>You will leave a bonfire. Second use will let you swap positions with it indefintiely. Using this move on the same tile as your active bonfire removes it.</span>"
chosen_attack_num = BONFIRE_TELEPORT
/datum/action/innate/elite_attack/spew_smoke
name = "Spew Smoke"
button_icon_state = "spew_smoke"
button_overlay_icon_state = "spew_smoke"
chosen_message = "<span class='boldwarning'>Your head will spew smoke in an area, wherever it may be.</span>"
chosen_attack_num = SPEW_SMOKE
code/modules/mob/living/simple_animal/hostile/mining/elites/pandora.dm
+4 -4
View File
@@ -54,25 +54,25 @@
/datum/action/innate/elite_attack/chaser_burst
name = "Chaser Burst"
button_icon_state = "singular_shot"
button_overlay_icon_state = "singular_shot"
chosen_message = "<span class='boldwarning'>You fire a chaser after all mobs in view.</span>"
chosen_attack_num = CHASER_BURST
/datum/action/innate/elite_attack/magic_box
name = "Magic Box"
button_icon_state = "magic_box"
button_overlay_icon_state = "magic_box"
chosen_message = "<span class='boldwarning'>You are now attacking with a box of magic squares.</span>"
chosen_attack_num = MAGIC_BOX
/datum/action/innate/elite_attack/pandora_teleport
name = "Line Teleport"
button_icon_state = "pandora_teleport"
button_overlay_icon_state = "pandora_teleport"
chosen_message = "<span class='boldwarning'>You will now teleport to your target.</span>"
chosen_attack_num = PANDORA_TELEPORT
/datum/action/innate/elite_attack/aoe_squares
name = "AOE Blast"
button_icon_state = "aoe_squares"
button_overlay_icon_state = "aoe_squares"
chosen_message = "<span class='boldwarning'>Your attacks will spawn an AOE blast at your target location.</span>"
chosen_attack_num = AOE_SQUARES
code/modules/mob/living/simple_animal/hostile/terror_spiders/actions.dm
+26 -26
View File
@@ -2,8 +2,8 @@
/datum/action/innate/terrorspider/web
name = "Web"
icon_icon = 'icons/effects/effects.dmi'
button_icon_state = "stickyweb1"
button_overlay_icon = 'icons/effects/effects.dmi'
button_overlay_icon_state = "stickyweb1"
/datum/action/innate/terrorspider/web/Activate()
var/mob/living/simple_animal/hostile/poison/terror_spider/user = owner
@@ -11,8 +11,8 @@
/datum/action/innate/terrorspider/wrap
name = "Wrap"
icon_icon = 'icons/effects/effects.dmi'
button_icon_state = "cocoon_large1"
button_overlay_icon = 'icons/effects/effects.dmi'
button_overlay_icon_state = "cocoon_large1"
/datum/action/innate/terrorspider/wrap/Activate()
var/mob/living/simple_animal/hostile/poison/terror_spider/user = owner
@@ -23,8 +23,8 @@
/datum/action/innate/terrorspider/greeneggs
name = "Lay Green Eggs"
icon_icon = 'icons/effects/effects.dmi'
button_icon_state = "eggs"
button_overlay_icon = 'icons/effects/effects.dmi'
button_overlay_icon_state = "eggs"
/datum/action/innate/terrorspider/greeneggs/Activate()
var/mob/living/simple_animal/hostile/poison/terror_spider/green/user = owner
@@ -35,8 +35,8 @@
/datum/action/innate/terrorspider/ventsmash
name = "Smash Welded Vent"
icon_icon = 'icons/atmos/vent_pump.dmi'
button_icon_state = "map_vent"
button_overlay_icon = 'icons/atmos/vent_pump.dmi'
button_overlay_icon_state = "map_vent"
/datum/action/innate/terrorspider/ventsmash/Activate()
var/mob/living/simple_animal/hostile/poison/terror_spider/user = owner
@@ -44,8 +44,8 @@
/datum/action/innate/terrorspider/remoteview
name = "Remote View"
icon_icon = 'icons/obj/eyes.dmi'
button_icon_state = "heye"
button_overlay_icon = 'icons/obj/eyes.dmi'
button_overlay_icon_state = "heye"
/datum/action/innate/terrorspider/remoteview/Activate()
var/mob/living/simple_animal/hostile/poison/terror_spider/user = owner
@@ -56,8 +56,8 @@
/datum/action/innate/terrorspider/mother/royaljelly
name = "Lay Royal Jelly"
icon_icon = 'icons/mob/actions/actions.dmi'
button_icon_state = "spiderjelly"
button_overlay_icon = 'icons/mob/actions/actions.dmi'
button_overlay_icon_state = "spiderjelly"
/datum/action/innate/terrorspider/mother/royaljelly/Activate()
var/mob/living/simple_animal/hostile/poison/terror_spider/mother/user = owner
@@ -65,8 +65,8 @@
/datum/action/innate/terrorspider/mother/gatherspiderlings
name = "Gather Spiderlings"
icon_icon = 'icons/effects/effects.dmi'
button_icon_state = "spiderling"
button_overlay_icon = 'icons/effects/effects.dmi'
button_overlay_icon_state = "spiderling"
/datum/action/innate/terrorspider/mother/gatherspiderlings/Activate()
var/mob/living/simple_animal/hostile/poison/terror_spider/mother/user = owner
@@ -74,8 +74,8 @@
/datum/action/innate/terrorspider/mother/incubateeggs
name = "Incubate Eggs"
icon_icon = 'icons/effects/effects.dmi'
button_icon_state = "eggs"
button_overlay_icon = 'icons/effects/effects.dmi'
button_overlay_icon_state = "eggs"
/datum/action/innate/terrorspider/mother/incubateeggs/Activate()
var/mob/living/simple_animal/hostile/poison/terror_spider/mother/user = owner
@@ -85,8 +85,8 @@
/datum/action/innate/terrorspider/queen/queennest
name = "Nest"
icon_icon = 'icons/mob/terrorspider.dmi'
button_icon_state = "terror_queen"
button_overlay_icon = 'icons/mob/terrorspider.dmi'
button_overlay_icon_state = "terror_queen"
/datum/action/innate/terrorspider/queen/queennest/Activate()
var/mob/living/simple_animal/hostile/poison/terror_spider/queen/user = owner
@@ -94,8 +94,8 @@
/datum/action/innate/terrorspider/queen/queensense
name = "Hive Sense"
icon_icon = 'icons/mob/actions/actions.dmi'
button_icon_state = "mindswap"
button_overlay_icon = 'icons/mob/actions/actions.dmi'
button_overlay_icon_state = "mindswap"
/datum/action/innate/terrorspider/queen/queensense/Activate()
var/mob/living/simple_animal/hostile/poison/terror_spider/queen/user = owner
@@ -103,8 +103,8 @@
/datum/action/innate/terrorspider/queen/queeneggs
name = "Lay Queen Eggs"
icon_icon = 'icons/effects/effects.dmi'
button_icon_state = "eggs"
button_overlay_icon = 'icons/effects/effects.dmi'
button_overlay_icon_state = "eggs"
/datum/action/innate/terrorspider/queen/queeneggs/Activate()
var/mob/living/simple_animal/hostile/poison/terror_spider/queen/user = owner
@@ -115,8 +115,8 @@
/datum/action/innate/terrorspider/queen/empress/empresserase
name = "Empress Erase Brood"
icon_icon = 'icons/effects/blood.dmi'
button_icon_state = "mgibbl1"
button_overlay_icon = 'icons/effects/blood.dmi'
button_overlay_icon_state = "mgibbl1"
/datum/action/innate/terrorspider/queen/empress/empresserase/Activate()
var/mob/living/simple_animal/hostile/poison/terror_spider/queen/empress/user = owner
@@ -124,8 +124,8 @@
/datum/action/innate/terrorspider/queen/empress/empresslings
name = "Empresss Spiderlings"
icon_icon = 'icons/effects/effects.dmi'
button_icon_state = "spiderling"
button_overlay_icon = 'icons/effects/effects.dmi'
button_overlay_icon_state = "spiderling"
/datum/action/innate/terrorspider/queen/empress/empresslings/Activate()
var/mob/living/simple_animal/hostile/poison/terror_spider/queen/empress/user = owner
code/modules/mob/living/simple_animal/slime/slime_powers.dm
+5 -5
View File
@@ -7,8 +7,8 @@
/datum/action/innate/slime
check_flags = AB_CHECK_CONSCIOUS
icon_icon = 'icons/mob/actions/actions_slime.dmi'
background_icon_state = "bg_alien"
button_overlay_icon = 'icons/mob/actions/actions_slime.dmi'
button_background_icon_state = "bg_alien"
var/needs_growth = NO_GROWTH_NEEDED
/datum/action/innate/slime/IsAvailable()
@@ -38,7 +38,7 @@
/datum/action/innate/slime/feed
name = "Feed"
button_icon_state = "slimeeat"
button_overlay_icon_state = "slimeeat"
/datum/action/innate/slime/feed/Activate()
@@ -140,7 +140,7 @@
/datum/action/innate/slime/evolve
name = "Evolve"
button_icon_state = "slimegrow"
button_overlay_icon_state = "slimegrow"
needs_growth = GROWTH_NEEDED
/datum/action/innate/slime/evolve/Activate()
@@ -200,7 +200,7 @@
/datum/action/innate/slime/reproduce
name = "Reproduce"
button_icon_state = "slimesplit"
button_overlay_icon_state = "slimesplit"
needs_growth = GROWTH_NEEDED
/datum/action/innate/slime/reproduce/Activate()