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

brainloss check for topic and autolathe hack designs fix

Browse Source
This commit is contained in:
Jordie0608
2015-05-30 21:24:23 +10:00
parent 6b524f09a9
commit fc5149dbc3
2 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/wires/autolathe.dm
+2 -1
View File
@@ -27,7 +27,8 @@ var/const/AUTOLATHE_DISABLE_WIRE = 4
var/obj/machinery/autolathe/A = holder
switch(index)
if(AUTOLATHE_HACK_WIRE)
A.adjust_hacked(!mended)
if(!A.hacked)
A.adjust_hacked(1)
if(AUTOLATHE_SHOCK_WIRE)
A.shocked = !mended
if(AUTOLATHE_DISABLE_WIRE)
code/game/machinery/machinery.dm
+15 -12
View File
@@ -246,6 +246,12 @@ Class Procs:
return
if(!isturf(M.loc) && M.loc != src)
return
if(getBrainLoss() >= 60)
visible_message("<span class='danger'>[src] stares cluelessly at [M] and drools.</span>")
return
if(prob(getBrainLoss()))
src << "<span class='warning'>You momentarily forget how to use [M]!</span>"
return
return 1
/mob/living/silicon/ai/canUseTopic(atom/movable/M, be_close = 0)
@@ -281,22 +287,11 @@ Class Procs:
//set_machine must be 0 if clicking the machinery doesn't bring up a dialog
/obj/machinery/attack_hand(mob/user as mob, var/check_power = 1, var/set_machine = 1)
if(check_power && stat & NOPOWER)
user << "<span class='danger'>\The [src] seems unpowered.</span>"
return 1
if(!interact_offline && stat & (BROKEN|MAINT))
user << "<span class='danger'>\The [src] seems broken.</span>"
return 1
if(user.lying || user.stat)
return 1
if(!user.IsAdvancedToolUser())
usr << "<span class='warning'>You don't have the dexterity to do this!</span>"
return 1
/*
//distance checks are made by atom/proc/DblClick
if ((get_dist(src, user) > 1 || !istype(src.loc, /turf)) && !istype(user, /mob/living/silicon))
return 1
*/
if (ishuman(user))
var/mob/living/carbon/human/H = user
if(H.getBrainLoss() >= 60)
@@ -305,7 +300,15 @@ Class Procs:
else if(prob(H.getBrainLoss()))
user << "<span class='warning'>You momentarily forget how to use [src]!</span>"
return 1
if(panel_open)
src.add_fingerprint(user)
return 0
if(check_power && stat & NOPOWER)
user << "<span class='danger'>\The [src] seems unpowered.</span>"
return 1
if(!interact_offline && stat & (BROKEN|MAINT))
user << "<span class='danger'>\The [src] seems broken.</span>"
return 1
src.add_fingerprint(user)
if(set_machine)
user.set_machine(src)