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

Merge pull request #4799 from phil235/MachineryFix

Browse Source 
Multiple machinery fixes
This commit is contained in:
Alex
2014-09-14 13:08:30 +01:00
parent 165df7e0ab d056cf1b69
commit a3ba933515
5 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
code/game/machinery/alarm.dm
View File

@@ -1032,7 +1032,6 @@ FIRE ALARM
qdel(src) qdel(src)
return return
src.alarm()
return return
/obj/machinery/firealarm/process()//Note: this processing was mostly phased out due to other code, and only runs when needed /obj/machinery/firealarm/process()//Note: this processing was mostly phased out due to other code, and only runs when needed

2
code/game/machinery/computer/arcade.dm
View File

@@ -342,6 +342,8 @@
gameover = 0 gameover = 0
/obj/machinery/computer/arcade/orion_trail/attack_hand(mob/user as mob) /obj/machinery/computer/arcade/orion_trail/attack_hand(mob/user as mob)
if(..())
return
if(fuel <= 0 || food <=0 || settlers.len == 0) if(fuel <= 0 || food <=0 || settlers.len == 0)
gameover = 1 gameover = 1
event = null event = null

12
code/game/machinery/pipe/pipe_dispenser.dm
View File

@@ -11,7 +11,7 @@
/obj/machinery/pipedispenser/attack_hand(user as mob) /obj/machinery/pipedispenser/attack_hand(user as mob)
if(..()) if(..())
return return 1
var/dat = {" var/dat = {"
<b>Regular pipes:</b><BR> <b>Regular pipes:</b><BR>
<A href='?src=\ref[src];make=0;dir=1'>Pipe</A><BR> <A href='?src=\ref[src];make=0;dir=1'>Pipe</A><BR>
@@ -46,10 +46,10 @@
/obj/machinery/pipedispenser/Topic(href, href_list) /obj/machinery/pipedispenser/Topic(href, href_list)
if(..()) if(..())
return return 1
if(!anchored|| !usr.canmove || usr.stat || usr.restrained() || !in_range(loc, usr)) if(!anchored|| !usr.canmove || usr.stat || usr.restrained() || !in_range(loc, usr))
usr << browse(null, "window=pipedispenser") usr << browse(null, "window=pipedispenser")
return return 1
usr.set_machine(src) usr.set_machine(src)
src.add_fingerprint(usr) src.add_fingerprint(usr)
if(href_list["make"]) if(href_list["make"])
@@ -149,6 +149,7 @@ Nah
<A href='?src=\ref[src];dmake=5'>Bin</A><BR> <A href='?src=\ref[src];dmake=5'>Bin</A><BR>
<A href='?src=\ref[src];dmake=6'>Outlet</A><BR> <A href='?src=\ref[src];dmake=6'>Outlet</A><BR>
<A href='?src=\ref[src];dmake=7'>Chute</A><BR> <A href='?src=\ref[src];dmake=7'>Chute</A><BR>
<A href='?src=\ref[src];dmake=8'>Sort Junction</A><BR>
"} "}
user << browse("<HEAD><TITLE>[src]</TITLE></HEAD><TT>[dat]</TT>", "window=pipedispenser") user << browse("<HEAD><TITLE>[src]</TITLE></HEAD><TT>[dat]</TT>", "window=pipedispenser")
@@ -163,9 +164,6 @@ Nah
usr.set_machine(src) usr.set_machine(src)
src.add_fingerprint(usr) src.add_fingerprint(usr)
if(href_list["dmake"]) if(href_list["dmake"])
if(!anchored || !usr.canmove || usr.stat || usr.restrained() || !in_range(loc, usr))
usr << browse(null, "window=pipedispenser")
return
if(!wait) if(!wait)
var/p_type = text2num(href_list["dmake"]) var/p_type = text2num(href_list["dmake"])
var/obj/structure/disposalconstruct/C = new (src.loc) var/obj/structure/disposalconstruct/C = new (src.loc)
@@ -189,6 +187,8 @@ Nah
if(7) if(7)
C.ptype = 8 C.ptype = 8
C.density = 1 C.density = 1
if(8)
C.ptype = 9
C.add_fingerprint(usr) C.add_fingerprint(usr)
C.update() C.update()
wait = 1 wait = 1

2
code/modules/food&drinks/kitchen machinery/microwave.dm
View File

@@ -183,6 +183,8 @@
return 0 return 0
/obj/machinery/microwave/attack_hand(mob/user as mob) /obj/machinery/microwave/attack_hand(mob/user as mob)
if(..())
return
user.set_machine(src) user.set_machine(src)
interact(user) interact(user)

2
code/modules/power/singularity/collector.dm
View File

@@ -36,6 +36,8 @@ var/global/list/rad_collectors = list()
/obj/machinery/power/rad_collector/attack_hand(mob/user as mob) /obj/machinery/power/rad_collector/attack_hand(mob/user as mob)
if(..())
return
if(anchored) if(anchored)
if(!src.locked) if(!src.locked)
toggle_power() toggle_power()