Skip to content
This repository has been archived by the owner on May 30, 2022. It is now read-only.

Add flock control panel to abilities after rift spawn #129

Merged
merged 1 commit into from
Apr 8, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions code/datums/abilities/flock/flockmind.dm
Original file line number Diff line number Diff line change
Expand Up @@ -355,8 +355,8 @@
/////////////////////////////////////////

/datum/targetable/flockmindAbility/controlPanel
name = "Flock Control"
desc = "(TEMPORARY) Open flock control panel."
name = "Flock Control Panel"
desc = "Open the Flock control panel."
icon_state = "radio_stun"
targeted = 0
cooldown = 0
Expand Down
2 changes: 1 addition & 1 deletion code/mob/living/intangible/flock/flockmind.dm
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
src.update_name_tag()
src.flock.registerFlockmind(src)
src.flock.showAnnotations(src)
src.addAbility(/datum/targetable/flockmindAbility/controlPanel)
src.addAbility(/datum/targetable/flockmindAbility/spawnEgg)

/mob/living/intangible/flock/flockmind/special_desc(dist, mob/user)
Expand Down Expand Up @@ -76,6 +75,7 @@
src.addAllAbilities()

/mob/living/intangible/flock/flockmind/proc/addAllAbilities()
src.addAbility(/datum/targetable/flockmindAbility/controlPanel)
src.addAbility(/datum/targetable/flockmindAbility/designateTile)
src.addAbility(/datum/targetable/flockmindAbility/designateEnemy)
src.addAbility(/datum/targetable/flockmindAbility/partitionMind)
Expand Down