cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 10:12:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into upstream-merge-14148

Browse Source
This commit is contained in:
Nadyr
2022-12-02 20:46:08 -05:00
committed by GitHub
parent 47d8000b2d 6e3b8bbaa7
commit 0b5c3ff9e1
49 changed files with 458 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
code/game/objects/items/devices/hacktool.dm
View File

@@ -1,25 +1,19 @@
/obj/item/device/multitool/hacktool
var/is_hacking = 0
var/max_known_targets
<<<<<<< HEAD
=======
var/hackspeed = 1
var/max_level = 4 //what's the max door security_level we can handle?
var/full_override = FALSE //can we override door bolts too? defaults to false for event/safety reasons
>>>>>>> c28095b90b... Merge pull request #14148 from KillianKirilenko/kk-hacktool
var/in_hack_mode = 0
var/list/known_targets
var/list/supported_types
var/datum/tgui_state/default/must_hack/hack_state
<<<<<<< HEAD
=======
/obj/item/device/multitool/hacktool/override
hackspeed = 0.75
max_level = 5
full_override = TRUE
>>>>>>> c28095b90b... Merge pull request #14148 from KillianKirilenko/kk-hacktool
/obj/item/device/multitool/hacktool/New()
..()
@@ -53,7 +47,23 @@
return 0
// Note, if you ever want to expand supported_types, you must manually add the custom state argument to their tgui_interact
A.tgui_interact(user, custom_state = hack_state)
// DISABLED: too fancy, too high-effort // A.tgui_interact(user, custom_state = hack_state)
// Just brute-force it
if(istype(A, /obj/machinery/door/airlock))
var/obj/machinery/door/airlock/D = A
if(!D.arePowerSystemsOn())
to_chat(user, "<span class='warning'>No response from remote, check door power.</span>")
else if(D.locked == TRUE && full_override == FALSE)
to_chat(user, "<span class='warning'>Unable to override door bolts!</span>")
else if(D.locked == TRUE && full_override == TRUE && D.arePowerSystemsOn())
to_chat(user, "<span class='notice'>Door bolts overridden.</span>")
D.unlock()
else if(D.density == TRUE && D.locked == FALSE)
to_chat(user, "<span class='notice'>Overriding access. Door opening.</span>")
D.open()
else if(D.density == FALSE && D.locked == FALSE)
to_chat(user, "<span class='notice'>Overriding access. Door closing.</span>")
D.close()
return 1
/obj/item/device/multitool/hacktool/proc/attempt_hack(var/mob/user, var/atom/target)
@@ -75,14 +85,9 @@
return 1
to_chat(user, "<span class='notice'>You begin hacking \the [D]...</span>")
is_hacking = 1
<<<<<<< HEAD
// On average hackin takes ~30 seconds. Fairly small random span to avoid people simply aborting and trying again
var/hack_result = do_after(user, (20 SECONDS + rand(0, 10 SECONDS) + rand(0, 10 SECONDS)))
=======
// On average hackin takes ~15 seconds. Fairly small random span to avoid people simply aborting and trying again
// Reduced hack duration to compensate for the reduced functionality, multiplied by door sec level
var/hack_result = do_after(user, (((10 SECONDS + rand(0, 10 SECONDS) + rand(0, 10 SECONDS))*hackspeed)*D.security_level))
>>>>>>> c28095b90b... Merge pull request #14148 from KillianKirilenko/kk-hacktool
is_hacking = 0
if(hack_result && in_hack_mode)