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

-New sprites APC sprites by TankNut!

Browse Source 
-New wraith sprites by TankNut!
-Decreased flare duration, again(!)
-Made a based interact proc and changed the updateDialog to call that instead of attack_hand. This caused issues with the APC and getting the power cell out of it. I then changed all machines that had their own defined proc (that was everywhere)


git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5001 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
giacomand@gmail.com
2012-11-03 14:45:29 +00:00
parent 8720dd0e69
commit b00c0c2a9f
38 changed files with 136 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
code/ATMOSPHERICS/components/binary_devices/passive_gate.dm
View File

@@ -88,14 +88,14 @@ obj/machinery/atmospherics/binary/passive_gate
return 1 return 1
interact(mob/user as mob) interact(mob/user as mob)
var/dat = {"<b>Power: </b><a href='?src=\ref[src];power=1'>[on?"On":"Off"]</a><br> var/dat = {"<b>Power: </b><a href='?src=\ref[src];power=1'>[on?"On":"Off"]</a><br>
<b>Desirable output pressure: </b> <b>Desirable output pressure: </b>
[round(target_pressure,0.1)]kPa | <a href='?src=\ref[src];set_press=1'>Change</a> [round(target_pressure,0.1)]kPa | <a href='?src=\ref[src];set_press=1'>Change</a>
"} "}
user << browse("<HEAD><TITLE>[src.name] control</TITLE></HEAD><TT>[dat]</TT>", "window=atmo_pump") user << browse("<HEAD><TITLE>[src.name] control</TITLE></HEAD><TT>[dat]</TT>", "window=atmo_pump")
onclose(user, "atmo_pump") onclose(user, "atmo_pump")
initialize() initialize()
..() ..()

14
code/ATMOSPHERICS/components/binary_devices/pump.dm
View File

@@ -101,14 +101,14 @@ obj/machinery/atmospherics/binary/pump
return 1 return 1
interact(mob/user as mob) interact(mob/user as mob)
var/dat = {"<b>Power: </b><a href='?src=\ref[src];power=1'>[on?"On":"Off"]</a><br> var/dat = {"<b>Power: </b><a href='?src=\ref[src];power=1'>[on?"On":"Off"]</a><br>
<b>Desirable output pressure: </b> <b>Desirable output pressure: </b>
[round(target_pressure,0.1)]kPa | <a href='?src=\ref[src];set_press=1'>Change</a> [round(target_pressure,0.1)]kPa | <a href='?src=\ref[src];set_press=1'>Change</a>
"} "}
user << browse("<HEAD><TITLE>[src.name] control</TITLE></HEAD><TT>[dat]</TT>", "window=atmo_pump") user << browse("<HEAD><TITLE>[src.name] control</TITLE></HEAD><TT>[dat]</TT>", "window=atmo_pump")
onclose(user, "atmo_pump") onclose(user, "atmo_pump")
initialize() initialize()
..() ..()

14
code/ATMOSPHERICS/components/binary_devices/volume_pump.dm
View File

@@ -97,14 +97,14 @@ obj/machinery/atmospherics/binary/volume_pump
return 1 return 1
interact(mob/user as mob) interact(mob/user as mob)
var/dat = {"<b>Power: </b><a href='?src=\ref[src];power=1'>[on?"On":"Off"]</a><br> var/dat = {"<b>Power: </b><a href='?src=\ref[src];power=1'>[on?"On":"Off"]</a><br>
<b>Desirable output flow: </b> <b>Desirable output flow: </b>
[round(transfer_rate,1)]l/s | <a href='?src=\ref[src];set_transfer_rate=1'>Change</a> [round(transfer_rate,1)]l/s | <a href='?src=\ref[src];set_transfer_rate=1'>Change</a>
"} "}
user << browse("<HEAD><TITLE>[src.name] control</TITLE></HEAD><TT>[dat]</TT>", "window=atmo_pump") user << browse("<HEAD><TITLE>[src.name] control</TITLE></HEAD><TT>[dat]</TT>", "window=atmo_pump")
onclose(user, "atmo_pump") onclose(user, "atmo_pump")

28
code/game/machinery/autolathe.dm
View File

@@ -102,20 +102,6 @@ var/global/list/autolathe_recipes_hidden = list( \
user << browse("<HTML><HEAD><TITLE>Autolathe Control Panel</TITLE></HEAD><BODY><TT>[dat]</TT></BODY></HTML>", "window=autolathe_regular") user << browse("<HTML><HEAD><TITLE>Autolathe Control Panel</TITLE></HEAD><BODY><TT>[dat]</TT></BODY></HTML>", "window=autolathe_regular")
onclose(user, "autolathe_regular") onclose(user, "autolathe_regular")
interact(mob/user as mob)
if(..())
return
if (src.shocked)
src.shock(user,50)
if (src.opened)
wires_win(user,50)
return
if (src.disabled)
user << "\red You press the button, but nothing happens."
return
regular_win(user)
return
shock(mob/user, prb) shock(mob/user, prb)
if(stat & (BROKEN|NOPOWER)) // unpowered, no shock if(stat & (BROKEN|NOPOWER)) // unpowered, no shock
return 0 return 0
@@ -129,6 +115,20 @@ var/global/list/autolathe_recipes_hidden = list( \
else else
return 0 return 0
interact(mob/user as mob)
if(..())
return
if (src.shocked)
src.shock(user,50)
if (src.opened)
wires_win(user,50)
return
if (src.disabled)
user << "\red You press the button, but nothing happens."
return
regular_win(user)
return
attackby(var/obj/item/O as obj, var/mob/user as mob) attackby(var/obj/item/O as obj, var/mob/user as mob)
if (stat) if (stat)
return 1 return 1

2
code/game/machinery/biogenerator.dm
View File

@@ -74,7 +74,7 @@
update_icon() update_icon()
return return
/obj/machinery/biogenerator/proc/interact(mob/user as mob) /obj/machinery/biogenerator/interact(mob/user as mob)
if(stat & BROKEN) if(stat & BROKEN)
return return
user.set_machine(src) user.set_machine(src)

2
code/game/machinery/bots/cleanbot.dm
View File

@@ -79,7 +79,7 @@
usr.set_machine(src) usr.set_machine(src)
interact(user) interact(user)
/obj/machinery/bot/cleanbot/proc/interact(mob/user as mob) /obj/machinery/bot/cleanbot/interact(mob/user as mob)
var/dat var/dat
dat += text({" dat += text({"
<TT><B>Automatic Station Cleaner v1.0</B></TT><BR><BR> <TT><B>Automatic Station Cleaner v1.0</B></TT><BR><BR>

2
code/game/machinery/bots/floorbot.dm
View File

@@ -75,7 +75,7 @@
usr.set_machine(src) usr.set_machine(src)
interact(user) interact(user)
/obj/machinery/bot/floorbot/proc/interact(mob/user as mob) /obj/machinery/bot/floorbot/interact(mob/user as mob)
var/dat var/dat
dat += "<TT><B>Automatic Station Floor Repairer v1.0</B></TT><BR><BR>" dat += "<TT><B>Automatic Station Floor Repairer v1.0</B></TT><BR><BR>"
dat += "Status: <A href='?src=\ref[src];operation=start'>[src.on ? "On" : "Off"]</A><BR>" dat += "Status: <A href='?src=\ref[src];operation=start'>[src.on ? "On" : "Off"]</A><BR>"

2
code/game/machinery/bots/mulebot.dm
View File

@@ -202,7 +202,7 @@
user.set_machine(src) user.set_machine(src)
interact(user, 0) interact(user, 0)
/obj/machinery/bot/mulebot/proc/interact(var/mob/user, var/ai=0) /obj/machinery/bot/mulebot/interact(var/mob/user, var/ai=0)
var/dat var/dat
dat += "<TT><B>Multiple Utility Load Effector Mk. III</B></TT><BR><BR>" dat += "<TT><B>Multiple Utility Load Effector Mk. III</B></TT><BR><BR>"
dat += "ID: [suffix]<BR>" dat += "ID: [suffix]<BR>"

2
code/game/machinery/bots/secbot.dm
View File

@@ -102,7 +102,7 @@
usr.set_machine(src) usr.set_machine(src)
interact(user) interact(user)
/obj/machinery/bot/secbot/proc/interact(mob/user as mob) /obj/machinery/bot/secbot/interact(mob/user as mob)
var/dat var/dat
dat += text({" dat += text({"

2
code/game/machinery/camera/wires.dm
View File

@@ -98,7 +98,7 @@
src.interact(usr) src.interact(usr)
/obj/machinery/camera/proc/interact(mob/living/user as mob) /obj/machinery/camera/interact(mob/living/user as mob)
if(!panel_open) if(!panel_open)
return return

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

@@ -30,7 +30,7 @@
interact(user) interact(user)
/obj/machinery/computer/operating/proc/interact(mob/user) /obj/machinery/computer/operating/interact(mob/user)
if ( (get_dist(src, user) > 1 ) || (stat & (BROKEN|NOPOWER)) ) if ( (get_dist(src, user) > 1 ) || (stat & (BROKEN|NOPOWER)) )
if (!istype(user, /mob/living/silicon)) if (!istype(user, /mob/living/silicon))
user.unset_machine() user.unset_machine()

113
code/game/machinery/computer/crew.dm
View File

@@ -53,67 +53,66 @@
return return
proc interact(mob/user)
interact(mob/user) if( (get_dist(src, user) > 1 ) || (stat & (BROKEN|NOPOWER)) )
if( (get_dist(src, user) > 1 ) || (stat & (BROKEN|NOPOWER)) ) if(!istype(user, /mob/living/silicon))
if(!istype(user, /mob/living/silicon)) user.unset_machine()
user.unset_machine() user << browse(null, "window=powcomp")
user << browse(null, "window=powcomp") return
return user.set_machine(src)
user.set_machine(src) src.scan()
src.scan() var/t = "<TT><B>Crew Monitoring</B><HR>"
var/t = "<TT><B>Crew Monitoring</B><HR>" t += "<BR><A href='?src=\ref[src];update=1'>Refresh</A> "
t += "<BR><A href='?src=\ref[src];update=1'>Refresh</A> " t += "<A href='?src=\ref[src];close=1'>Close</A><BR>"
t += "<A href='?src=\ref[src];close=1'>Close</A><BR>" t += "<table><tr><td width='40%'>Name</td><td width='20%'>Vitals</td><td width='40%'>Position</td></tr>"
t += "<table><tr><td width='40%'>Name</td><td width='20%'>Vitals</td><td width='40%'>Position</td></tr>" var/list/logs = list()
var/list/logs = list() for(var/obj/item/clothing/under/C in src.tracked)
for(var/obj/item/clothing/under/C in src.tracked) var/log = ""
var/log = "" var/turf/pos = get_turf(C)
var/turf/pos = get_turf(C) if((C) && (C.has_sensor) && (pos) && (pos.z == src.z) && C.sensor_mode)
if((C) && (C.has_sensor) && (pos) && (pos.z == src.z) && C.sensor_mode) if(istype(C.loc, /mob/living/carbon/human))
if(istype(C.loc, /mob/living/carbon/human))
var/mob/living/carbon/human/H = C.loc var/mob/living/carbon/human/H = C.loc
var/dam1 = round(H.getOxyLoss(),1) var/dam1 = round(H.getOxyLoss(),1)
var/dam2 = round(H.getToxLoss(),1) var/dam2 = round(H.getToxLoss(),1)
var/dam3 = round(H.getFireLoss(),1) var/dam3 = round(H.getFireLoss(),1)
var/dam4 = round(H.getBruteLoss(),1) var/dam4 = round(H.getBruteLoss(),1)
var/life_status = "[H.stat > 1 ? "<font color=red>Deceased</font>" : "Living"]" var/life_status = "[H.stat > 1 ? "<font color=red>Deceased</font>" : "Living"]"
var/damage_report = "(<font color='blue'>[dam1]</font>/<font color='green'>[dam2]</font>/<font color='orange'>[dam3]</font>/<font color='red'>[dam4]</font>)" var/damage_report = "(<font color='blue'>[dam1]</font>/<font color='green'>[dam2]</font>/<font color='orange'>[dam3]</font>/<font color='red'>[dam4]</font>)"
if(H.wear_id) if(H.wear_id)
log += "<tr><td width='40%'>[H.wear_id.name]</td>" log += "<tr><td width='40%'>[H.wear_id.name]</td>"
else else
log += "<tr><td width='40%'>Unknown</td>" log += "<tr><td width='40%'>Unknown</td>"
switch(C.sensor_mode) switch(C.sensor_mode)
if(1) if(1)
log += "<td width='15%'>[life_status]</td><td width='40%'>Not Available</td></tr>" log += "<td width='15%'>[life_status]</td><td width='40%'>Not Available</td></tr>"
if(2) if(2)
log += "<td width='20%'>[life_status] [damage_report]</td><td width='40%'>Not Available</td></tr>" log += "<td width='20%'>[life_status] [damage_report]</td><td width='40%'>Not Available</td></tr>"
if(3) if(3)
var/area/player_area = get_area(H) var/area/player_area = get_area(H)
log += "<td width='20%'>[life_status] [damage_report]</td><td width='40%'>[player_area.name] ([pos.x], [pos.y])</td></tr>" log += "<td width='20%'>[life_status] [damage_report]</td><td width='40%'>[player_area.name] ([pos.x], [pos.y])</td></tr>"
logs += log logs += log
logs = sortList(logs) logs = sortList(logs)
for(var/log in logs) for(var/log in logs)
t += log t += log
t += "</table>" t += "</table>"
t += "</FONT></PRE></TT>" t += "</FONT></PRE></TT>"
user << browse(t, "window=crewcomp;size=900x600") user << browse(t, "window=crewcomp;size=900x600")
onclose(user, "crewcomp") onclose(user, "crewcomp")
scan() proc/scan()
for(var/obj/item/clothing/under/C in world) for(var/obj/item/clothing/under/C in world)
if((C.has_sensor) && (istype(C.loc, /mob/living/carbon/human))) if((C.has_sensor) && (istype(C.loc, /mob/living/carbon/human)))
var/check = 0 var/check = 0
for(var/O in src.tracked) for(var/O in src.tracked)
if(O == C) if(O == C)
check = 1 check = 1
break break
if(!check) if(!check)
src.tracked.Add(C) src.tracked.Add(C)
return 1 return 1

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

@@ -68,7 +68,7 @@
src.attack_hand(user) src.attack_hand(user)
return return
/obj/machinery/power/monitor/proc/interact(mob/user) /obj/machinery/power/monitor/interact(mob/user)
if ( (get_dist(src, user) > 1 ) || (stat & (BROKEN|NOPOWER)) ) if ( (get_dist(src, user) > 1 ) || (stat & (BROKEN|NOPOWER)) )
if (!istype(user, /mob/living/silicon)) if (!istype(user, /mob/living/silicon))

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

@@ -23,7 +23,7 @@
return return
proc/interact(mob/user) interact(mob/user)
usr.set_machine(src) usr.set_machine(src)
var/dat = "<HEAD><TITLE>Current Station Alerts</TITLE><META HTTP-EQUIV='Refresh' CONTENT='10'></HEAD><BODY>\n" var/dat = "<HEAD><TITLE>Current Station Alerts</TITLE><META HTTP-EQUIV='Refresh' CONTENT='10'></HEAD><BODY>\n"
dat += "<A HREF='?src=\ref[user];mach_close=alerts'>Close</A><br><br>" dat += "<A HREF='?src=\ref[user];mach_close=alerts'>Close</A><br><br>"

2
code/game/machinery/kitchen/juicer.dm
View File

@@ -62,7 +62,7 @@
user.set_machine(src) user.set_machine(src)
interact(user) interact(user)
/obj/machinery/juicer/proc/interact(mob/user as mob) // The microwave Menu /obj/machinery/juicer/interact(mob/user as mob) // The microwave Menu
var/is_chamber_empty = 0 var/is_chamber_empty = 0
var/is_beaker_ready = 0 var/is_beaker_ready = 0
var/processing_chamber = "" var/processing_chamber = ""

2
code/game/machinery/kitchen/microwave.dm
View File

@@ -146,7 +146,7 @@
* Microwave Menu * Microwave Menu
********************/ ********************/
/obj/machinery/microwave/proc/interact(mob/user as mob) // The microwave Menu /obj/machinery/microwave/interact(mob/user as mob) // The microwave Menu
var/dat = "" var/dat = ""
if(src.broken > 0) if(src.broken > 0)
dat = {"<TT>Bzzzzttttt</TT>"} dat = {"<TT>Bzzzzttttt</TT>"}

2
code/game/machinery/kitchen/smartfridge.dm
View File

@@ -89,7 +89,7 @@
* SmartFridge Menu * SmartFridge Menu
********************/ ********************/
/obj/machinery/smartfridge/proc/interact(mob/user as mob) /obj/machinery/smartfridge/interact(mob/user as mob)
if(!src.ispowered) if(!src.ispowered)
return return

2
code/game/machinery/navbeacon.dm
View File

@@ -132,7 +132,7 @@
attack_hand(var/mob/user) attack_hand(var/mob/user)
interact(user, 0) interact(user, 0)
proc/interact(var/mob/user, var/ai = 0) interact(var/mob/user, var/ai = 0)
var/turf/T = loc var/turf/T = loc
if(T.intact) if(T.intact)
return // prevent intraction when T-scanner revealed return // prevent intraction when T-scanner revealed

2
code/game/objects/items/blueprints.dm
View File

@@ -44,7 +44,7 @@
return return
edit_area() edit_area()
/obj/item/blueprints/proc/interact() /obj/item/blueprints/interact()
var/area/A = get_area() var/area/A = get_area()
var/text = {"<HTML><head><title>[src]</title></head><BODY> var/text = {"<HTML><head><title>[src]</title></head><BODY>
<h2>[station_name()] blueprints</h2> <h2>[station_name()] blueprints</h2>

2
code/game/objects/items/devices/flashlight.dm
View File

@@ -152,7 +152,7 @@
var/produce_heat = 1500 var/produce_heat = 1500
/obj/item/device/flashlight/flare/New() /obj/item/device/flashlight/flare/New()
fuel = rand(3000, 4500) // Last 10 to 15 minutes. fuel = rand(1500, 2000) // Last 10 to 15 minutes.
..() ..()
/obj/item/device/flashlight/flare/process() /obj/item/device/flashlight/flare/process()

2
code/game/objects/items/devices/radio/radio.dm
View File

@@ -74,7 +74,7 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use
user.set_machine(src) user.set_machine(src)
interact(user) interact(user)
/obj/item/device/radio/proc/interact(mob/user as mob) /obj/item/device/radio/interact(mob/user as mob)
if(!on) if(!on)
return return

2
code/game/objects/items/devices/uplinks.dm
View File

@@ -294,7 +294,7 @@ A list of items and costs is stored under the datum of every game mode, alongsid
return 0 return 0
// Interaction code. Gathers a list of items purchasable from the paren't uplink and displays it. It also adds a lock button. // Interaction code. Gathers a list of items purchasable from the paren't uplink and displays it. It also adds a lock button.
/obj/item/device/uplink/hidden/proc/interact(mob/user as mob) /obj/item/device/uplink/hidden/interact(mob/user as mob)
var/dat = "<body link='yellow' alink='white' bgcolor='#601414'><font color='white'>" var/dat = "<body link='yellow' alink='white' bgcolor='#601414'><font color='white'>"
dat += src.generate_menu() dat += src.generate_menu()

2
code/game/objects/items/stacks/stack.dm
View File

@@ -34,7 +34,7 @@
/obj/item/stack/attack_self(mob/user as mob) /obj/item/stack/attack_self(mob/user as mob)
interact(user) interact(user)
/obj/item/stack/proc/interact(mob/user as mob) /obj/item/stack/interact(mob/user as mob)
if (!recipes) if (!recipes)
return return
if (!src || amount<=0) if (!src || amount<=0)

4
code/game/objects/objs.dm
View File

@@ -79,12 +79,14 @@
for(var/mob/M in nearby) for(var/mob/M in nearby)
if ((M.client && M.machine == src)) if ((M.client && M.machine == src))
is_in_use = 1 is_in_use = 1
src.attack_hand(M) src.interact(M)
var/ai_in_use = AutoUpdateAI(src) var/ai_in_use = AutoUpdateAI(src)
if(!ai_in_use && !is_in_use) if(!ai_in_use && !is_in_use)
in_use = 0 in_use = 0
/obj/proc/interact(mob/user)
return
/obj/proc/update_icon() /obj/proc/update_icon()
return return

2
code/modules/assembly/assembly.dm
View File

@@ -46,7 +46,7 @@
proc/holder_movement() //Called when the holder is moved proc/holder_movement() //Called when the holder is moved
return return
proc/interact(mob/user as mob) //Called when attack_self is called interact(mob/user as mob) //Called when attack_self is called
return return

2
code/modules/power/antimatter/control.dm
View File

@@ -260,7 +260,7 @@
return return
/obj/machinery/power/am_control_unit/proc/interact(mob/user) /obj/machinery/power/am_control_unit/interact(mob/user)
if((get_dist(src, user) > 1) || (stat & (BROKEN|NOPOWER))) if((get_dist(src, user) > 1) || (stat & (BROKEN|NOPOWER)))
if(!istype(user, /mob/living/silicon/ai)) if(!istype(user, /mob/living/silicon/ai))
user.unset_machine() user.unset_machine()

10
code/modules/power/apc.dm
View File

@@ -438,10 +438,12 @@
/obj/machinery/power/apc/attack_hand(mob/user) /obj/machinery/power/apc/attack_hand(mob/user)
// if (!can_use(user)) This already gets called in interact() and in topic() // if (!can_use(user)) This already gets called in interact() and in topic()
// return // return
if(!user)
return
src.add_fingerprint(user) src.add_fingerprint(user)
if(opened && (!issilicon(user))) if(usr == user && opened && (!issilicon(user)))
if(cell) if(cell)
usr.put_in_hands(cell) user.put_in_hands(cell)
cell.add_fingerprint(user) cell.add_fingerprint(user)
cell.updateicon() cell.updateicon()
@@ -450,7 +452,7 @@
//user << "You remove the power cell." //user << "You remove the power cell."
charging = 0 charging = 0
src.updateicon() src.updateicon()
return return
if(stat & (BROKEN|MAINT)) if(stat & (BROKEN|MAINT))
return return
@@ -488,7 +490,7 @@
/obj/machinery/power/apc/proc/interact(mob/user) /obj/machinery/power/apc/interact(mob/user)
if(!user) if(!user)
return return

2
code/modules/power/generator.dm
View File

@@ -121,7 +121,7 @@
interact(user) interact(user)
/obj/machinery/power/generator/proc/interact(mob/user) /obj/machinery/power/generator/interact(mob/user)
if ( (get_dist(src, user) > 1 ) && (!istype(user, /mob/living/silicon/ai))) if ( (get_dist(src, user) > 1 ) && (!istype(user, /mob/living/silicon/ai)))
user.unset_machine() user.unset_machine()
user << browse(null, "window=teg") user << browse(null, "window=teg")

2
code/modules/power/generator_type2.dm
View File

@@ -98,7 +98,7 @@
interact(user) interact(user)
/obj/machinery/power/generator_type2/proc/interact(mob/user) /obj/machinery/power/generator_type2/interact(mob/user)
if ( (get_dist(src, user) > 1 ) && (!istype(user, /mob/living/silicon/ai))) if ( (get_dist(src, user) > 1 ) && (!istype(user, /mob/living/silicon/ai)))
user.unset_machine() user.unset_machine()
user << browse(null, "window=teg") user << browse(null, "window=teg")

2
code/modules/power/port_gen.dm
View File

@@ -236,7 +236,7 @@ display round(lastgen) and plasmatank amount
/obj/machinery/power/port_gen/pacman/attack_paw(mob/user as mob) /obj/machinery/power/port_gen/pacman/attack_paw(mob/user as mob)
interact(user) interact(user)
/obj/machinery/power/port_gen/pacman/proc/interact(mob/user) /obj/machinery/power/port_gen/pacman/interact(mob/user)
if (get_dist(src, user) > 1 ) if (get_dist(src, user) > 1 )
if (!istype(user, /mob/living/silicon/ai)) if (!istype(user, /mob/living/silicon/ai))
user.unset_machine() user.unset_machine()

2
code/modules/power/singularity/particle_accelerator/particle_control.dm
View File

@@ -202,7 +202,7 @@
return 1 return 1
/obj/machinery/particle_accelerator/control_box/proc/interact(mob/user) /obj/machinery/particle_accelerator/control_box/interact(mob/user)
if((get_dist(src, user) > 1) || (stat & (BROKEN|NOPOWER))) if((get_dist(src, user) > 1) || (stat & (BROKEN|NOPOWER)))
if(!istype(user, /mob/living/silicon)) if(!istype(user, /mob/living/silicon))
user.unset_machine() user.unset_machine()

2
code/modules/power/smes.dm
View File

@@ -178,7 +178,7 @@
interact(user) interact(user)
/obj/machinery/power/smes/proc/interact(mob/user) /obj/machinery/power/smes/interact(mob/user)
if(get_dist(src, user) > 1 && !istype(user, /mob/living/silicon/ai)) if(get_dist(src, user) > 1 && !istype(user, /mob/living/silicon/ai))
user.unset_machine() user.unset_machine()
user << browse(null, "window=smes") user << browse(null, "window=smes")

1
code/modules/power/solar.dm
View File

@@ -171,7 +171,6 @@
tracker_update(var/angle) tracker_update(var/angle)
set_panels(var/cdir) set_panels(var/cdir)
broken() broken()
interact(mob/user)
New() New()

2
code/modules/reagents/Chemistry-Machinery.dm
View File

@@ -828,7 +828,7 @@
user.set_machine(src) user.set_machine(src)
interact(user) interact(user)
/obj/machinery/reagentgrinder/proc/interact(mob/user as mob) // The microwave Menu /obj/machinery/reagentgrinder/interact(mob/user as mob) // The microwave Menu
var/is_chamber_empty = 0 var/is_chamber_empty = 0
var/is_beaker_ready = 0 var/is_beaker_ready = 0
var/processing_chamber = "" var/processing_chamber = ""

2
code/modules/recycling/disposal.dm
View File

@@ -215,7 +215,7 @@
interact(user, 0) interact(user, 0)
// user interaction // user interaction
proc/interact(mob/user, var/ai=0) interact(mob/user, var/ai=0)
src.add_fingerprint(user) src.add_fingerprint(user)
if(stat & BROKEN) if(stat & BROKEN)

9
html/changelog.html
View File

@@ -49,6 +49,15 @@ should be listed in the changelog upon commit tho. Thanks. -->
<!-- To take advantage of the pretty new format (well it was new when I wrote this anyway), open the "add-to-changelog.html" file in any browser and add the stuff and then generate the html code and paste it here --> <!-- To take advantage of the pretty new format (well it was new when I wrote this anyway), open the "add-to-changelog.html" file in any browser and add the stuff and then generate the html code and paste it here -->
<div class="commit sansserif">
<h2 class="date">03 November 2012</h2>
<h3 class="author">TankNut updated:</h3>
<ul class="changes bgimages16">
<li class="imageadd">New APC sprite.</li>
<li class="imageadd">New Wraith sprite and jaunting animation.</li>
</ul>
</div>
<div class="commit sansserif"> <div class="commit sansserif">
<h2 class="date">03 November 2012</h2> <h2 class="date">03 November 2012</h2>
<h3 class="author">WJohnston updated:</h3> <h3 class="author">WJohnston updated:</h3>

BIN
icons/mob/mob.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 182 KiB

After

Width:  |  Height:  |  Size: 175 KiB

BIN
icons/obj/power.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 21 KiB

After

Width:  |  Height:  |  Size: 22 KiB