Skip to content

Commit

Permalink
Species.dm and emote.dm cleaning up. (#732)
Browse files Browse the repository at this point in the history
* species.dm reorg

* yautja.dm cleaning

* robot_action.dm

* emote.dm reorg

* Update human.dm

* delete useless vars

* pred_laugh

* Update human.dm

* hmm

* Revert "hmm"

This reverts commit 0d2da94.
  • Loading branch information
Helg2 authored Dec 2, 2024
1 parent 6ee3992 commit c695a3d
Show file tree
Hide file tree
Showing 32 changed files with 1,486 additions and 1,579 deletions.
21 changes: 21 additions & 0 deletions code/datums/actions/species_actions/robot_action.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
///Lets a robot repair itself over time at the cost of being stunned and blind
/datum/action/repair_self
name = "Activate autorepair"
action_icon_state = "suit_configure"
keybinding_signals = list(
KEYBINDING_NORMAL = COMSIG_KB_ROBOT_AUTOREPAIR,
)

/datum/action/repair_self/can_use_action()
. = ..()
if(!.)
return
return !owner.incapacitated()

/datum/action/repair_self/action_activate()
. = ..()
if(!. || !ishuman(owner))
return
var/mob/living/carbon/human/howner = owner
howner.apply_status_effect(STATUS_EFFECT_REPAIR_MODE, 10 SECONDS)
howner.balloon_alert_to_viewers("Repairing")
2 changes: 2 additions & 0 deletions code/game/sound.dm
Original file line number Diff line number Diff line change
Expand Up @@ -402,6 +402,8 @@ A good representation is: 'byond applies a volume reduction to the sound every X
S = pick('sound/voice/predator/pain_rare1.ogg')
if("pred_warcry")
S = pick('sound/voice/predator/warcry.ogg')
if("pred_laugh")
S = pick('sound/voice/predator/laugh1.ogg', 'sound/voice/predator/laugh2.ogg', 'sound/voice/predator/laugh3.ogg', 'sound/voice/predator/laugh4.ogg')

//pred items
if("clan_sword_hit")
Expand Down
Loading

0 comments on commit c695a3d

Please sign in to comment.