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

Merge pull request #29261 from Majkl-J/laserstuff

Browse Source 
Fixes felinid stuff and brings back laserpointing
This commit is contained in:
projectkepler-RU
2024-08-12 16:32:00 +07:00
committed by GitHub
parent 0348860d4d 5206cb4914
commit 3a08d5c6f6
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/devices/laserpointer.dm
+4 -6
View File
@@ -275,14 +275,12 @@
continue
if(target_felinid.body_position == STANDING_UP)
target_felinid.setDir(get_dir(target_felinid, targloc)) // kitty always looks at the light
//SKYRAT EDIT REMOVAL BEGIN (removes forced felinid movement from laserpointers, also fixes the longstanding windoor negation glitch)
/* if(prob(effectchance * diode.rating))
if(prob(effectchance * diode.rating))
target_felinid.visible_message(span_warning("[target_felinid] makes a grab for the light!"), span_userdanger("LIGHT!"))
target_felinid.Move(targloc)
target_felinid.Move(targloc, get_dir(target_felinid, targloc)) // SKYRAT EDIT: Fixes the felinid phazing bug. Remove this comment once fixed upstream
log_combat(user, target_felinid, "moved with a laser pointer", src)
else
SKYRAT EDIT REMOVAL END */
target_felinid.visible_message(span_notice("[target_felinid] looks briefly distracted by the light."), span_warning("You're briefly tempted by the shiny light...")) //SKYRAT EDIT CHANGE : indent this block if re-enabling above
else
target_felinid.visible_message(span_notice("[target_felinid] looks briefly distracted by the light."), span_warning("You're briefly tempted by the shiny light..."))
else
target_felinid.visible_message(span_notice("[target_felinid] stares at the light."), span_warning("You stare at the light..."))
//The pointer is shining, change its sprite to show