Fix SCRAM implant not working while cuffed. Incidentally fix freedom implant working while dead/crit (#25978)

* Fix SCRAM implant not being usable while in cuffs. Also fix freedom implant from working while dead/crit as a side effect

* Move check up to apply to all actions and do thing I forgor to do before

* Change check into an ActionBlocker check that also checks whether the user is sleeping.

* Make checking for Consciousness the default for actions

Went through and chose what I believe to be sensible defaults for actions that had CheckCanInteract.

* Fix typos my beloved

I had an unbelievable skill issue

* Fix major skill issue
This commit is contained in:
nikthechampiongr
2024-03-19 00:35:46 +02:00
committed by GitHub
parent 5185a4a6b3
commit 22e9d6562f
13 changed files with 142 additions and 3 deletions

View File

@@ -1,4 +1,4 @@
# Actions added to mobs in crit.
# Actions added to mobs in crit.
- type: entity
id: ActionCritSuccumb
name: Succumb
@@ -8,6 +8,7 @@
- type: InstantAction
itemIconStyle: NoItem
checkCanInteract: false
checkConsciousness: false
icon:
sprite: Mobs/Ghosts/ghost_human.rsi
state: icon
@@ -22,6 +23,7 @@
- type: InstantAction
itemIconStyle: NoItem
checkCanInteract: false
checkConsciousness: false
icon:
sprite: Interface/Actions/actions_crit.rsi
state: fakedeath
@@ -37,6 +39,7 @@
- type: InstantAction
itemIconStyle: NoItem
checkCanInteract: false
checkConsciousness: false
icon:
sprite: Interface/Actions/actions_crit.rsi
state: lastwords

View File

@@ -8,6 +8,7 @@
icon: Mobs/Species/Diona/organs.rsi/brain.png
event: !type:GibActionEvent {}
checkCanInteract: false
checkConsciousness: false
- type: entity
id: DionaReformAction

View File

@@ -29,6 +29,7 @@
components:
- type: InstantAction
checkCanInteract: false
checkConsciousness: false
icon: Interface/Actions/zombie-turn.png
event: !type:ZombifySelfActionEvent
@@ -66,6 +67,7 @@
components:
- type: InstantAction
checkCanInteract: false
checkConsciousness: false
itemIconStyle: BigAction
priority: -20
icon:
@@ -82,6 +84,7 @@
components:
- type: InstantAction
checkCanInteract: false
checkConsciousness: false
itemIconStyle: BigAction
priority: -20
icon:
@@ -143,6 +146,7 @@
noSpawn: true
components:
- type: InstantAction
checkCanInteract: false
charges: 2
useDelay: 5
itemIconStyle: BigAction
@@ -186,6 +190,7 @@
components:
- type: InstantAction
checkCanInteract: false
checkConsciousness: false
icon: Interface/Actions/harmOff.png
iconOn: Interface/Actions/harm.png
event: !type:ToggleCombatActionEvent
@@ -256,6 +261,7 @@
- type: InstantAction
clientExclusive: true
checkCanInteract: false
checkConsciousness: false
temporary: true
icon: { sprite: Objects/Tools/multitool.rsi, state: icon }
event: !type:ClearAllOverlaysEvent
@@ -279,6 +285,7 @@
components:
- type: InstantAction
checkCanInteract: false
checkConsciousness: false
icon: { sprite: Clothing/Head/Hats/pyjamasyndicatered.rsi, state: icon }
event: !type:SleepActionEvent
@@ -291,6 +298,7 @@
- type: InstantAction
icon: { sprite: Clothing/Head/Hats/pyjamasyndicatered.rsi, state: icon }
checkCanInteract: false
checkConsciousness: false
event: !type:WakeActionEvent
- type: entity
@@ -328,6 +336,7 @@
event: !type:ToggleEyesActionEvent
useDelay: 1 # so u cant give yourself and observers eyestrain by rapidly spamming the action
checkCanInteract: false
checkConsciousness: false
- type: entity
id: ActionToggleWagging