cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-24 04:28:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Capture cryatal tweaks (#19593)

Browse Source 
* Fix mob eating food pathway

* Remove redundant alert

* Moved eating message to better location

* Add capturing edge case

* Fix Capture crystal OOC Escape to stop CC ruining.

* Better OOC Fix for Caprture crystals

* Logic check

* Sync changes on branch Capture-crystal-tweaks

* Manual merge with upstream

* Added a very neccesary and time consuming "Space"

* 4 more Spaces added to the commit

* Cleared up admin log

* Spellcheck
This commit is contained in:
WolvesAndOwls
2026-07-10 23:27:38 +02:00
committed by GitHub
parent 6f3e0ae56d
commit b17541e91d
2 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/capture_crystal.dm
+9 -2
View File
@@ -337,8 +337,15 @@
else if(!M.capture_crystal || M.capture_caught)
to_chat(U, span_warning("This creature is not suitable for capture."))
playsound(src, 'sound/effects/capture-crystal-negative.ogg', 75, 1, -1)
else if(tgui_alert(M, "Would you like to be caught by in [src] by [U]? You will be bound to their will.", "Become Caught",list("No","Yes")) == "Yes")
if(tgui_alert(M, "Are you really sure? The only way to undo this is to OOC escape while you're in the crystal.", "Become Caught", list("No","Yes")) == "Yes")
//What if someone slips and tries to capture themselves?
else if(M == U && tgui_alert(M, "Would you like to be caught by [src]? You will be bound to the will of whomever claims ownership of the crystal.", "Become Caught",list("No","Yes")) == "Yes")
if(tgui_alert(M, "Are you really sure? The only way to undo this is to OOC escape while you're in the crystal.", "Become Caught", list("No", "Yes")) == "Yes")
log_admin("[key_name(M)] has, by their own volition and discretion, decided to catch themselves with [src].")
capture(M, null)
return
//Make sure the player can opt out of getting captured
else if(M != U && tgui_alert(M, "Would you like to be caught in [src] by [U]? You will be bound to their will.", "Become Caught",list("No", "Yes")) == "Yes")
if(tgui_alert(M, "Are you really sure? The only way to undo this is to OOC escape while you're in the crystal.", "Become Caught", list("No", "Yes")) == "Yes")
log_admin("[key_name(M)] has agreed to become caught by [key_name(U)].")
capture(M, U)
recall(U)