diff --git a/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm b/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm index feea5bff52c..e92cc485100 100644 --- a/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm +++ b/code/ATMOSPHERICS/components/binary_devices/passive_gate.dm @@ -88,14 +88,14 @@ obj/machinery/atmospherics/binary/passive_gate return 1 - interact(mob/user as mob) - var/dat = {"Power: [on?"On":"Off"]
- Desirable output pressure: - [round(target_pressure,0.1)]kPa | Change - "} + interact(mob/user as mob) + var/dat = {"Power: [on?"On":"Off"]
+ Desirable output pressure: + [round(target_pressure,0.1)]kPa | Change + "} - user << browse("[src.name] control[dat]", "window=atmo_pump") - onclose(user, "atmo_pump") + user << browse("[src.name] control[dat]", "window=atmo_pump") + onclose(user, "atmo_pump") initialize() ..() diff --git a/code/ATMOSPHERICS/components/binary_devices/pump.dm b/code/ATMOSPHERICS/components/binary_devices/pump.dm index 71cde943ea3..04aeccfff94 100644 --- a/code/ATMOSPHERICS/components/binary_devices/pump.dm +++ b/code/ATMOSPHERICS/components/binary_devices/pump.dm @@ -101,14 +101,14 @@ obj/machinery/atmospherics/binary/pump return 1 - interact(mob/user as mob) - var/dat = {"Power: [on?"On":"Off"]
- Desirable output pressure: - [round(target_pressure,0.1)]kPa | Change - "} + interact(mob/user as mob) + var/dat = {"Power: [on?"On":"Off"]
+ Desirable output pressure: + [round(target_pressure,0.1)]kPa | Change + "} - user << browse("[src.name] control[dat]", "window=atmo_pump") - onclose(user, "atmo_pump") + user << browse("[src.name] control[dat]", "window=atmo_pump") + onclose(user, "atmo_pump") initialize() ..() diff --git a/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm b/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm index e52f89e218f..2c5f2337064 100644 --- a/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm +++ b/code/ATMOSPHERICS/components/binary_devices/volume_pump.dm @@ -97,14 +97,14 @@ obj/machinery/atmospherics/binary/volume_pump return 1 - interact(mob/user as mob) - var/dat = {"Power: [on?"On":"Off"]
- Desirable output flow: - [round(transfer_rate,1)]l/s | Change - "} + interact(mob/user as mob) + var/dat = {"Power: [on?"On":"Off"]
+ Desirable output flow: + [round(transfer_rate,1)]l/s | Change + "} - user << browse("[src.name] control[dat]", "window=atmo_pump") - onclose(user, "atmo_pump") + user << browse("[src.name] control[dat]", "window=atmo_pump") + onclose(user, "atmo_pump") diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm index 8dbfc0e33f7..c08ff595eba 100644 --- a/code/game/machinery/autolathe.dm +++ b/code/game/machinery/autolathe.dm @@ -102,20 +102,6 @@ var/global/list/autolathe_recipes_hidden = list( \ user << browse("Autolathe Control Panel[dat]", "window=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) if(stat & (BROKEN|NOPOWER)) // unpowered, no shock return 0 @@ -129,6 +115,20 @@ var/global/list/autolathe_recipes_hidden = list( \ else 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) if (stat) return 1 diff --git a/code/game/machinery/biogenerator.dm b/code/game/machinery/biogenerator.dm index 0411a0b7906..80d4174fd43 100644 --- a/code/game/machinery/biogenerator.dm +++ b/code/game/machinery/biogenerator.dm @@ -74,7 +74,7 @@ update_icon() return -/obj/machinery/biogenerator/proc/interact(mob/user as mob) +/obj/machinery/biogenerator/interact(mob/user as mob) if(stat & BROKEN) return user.set_machine(src) diff --git a/code/game/machinery/bots/cleanbot.dm b/code/game/machinery/bots/cleanbot.dm index 299da4fdec9..ccd474cd089 100644 --- a/code/game/machinery/bots/cleanbot.dm +++ b/code/game/machinery/bots/cleanbot.dm @@ -79,7 +79,7 @@ usr.set_machine(src) interact(user) -/obj/machinery/bot/cleanbot/proc/interact(mob/user as mob) +/obj/machinery/bot/cleanbot/interact(mob/user as mob) var/dat dat += text({" Automatic Station Cleaner v1.0

diff --git a/code/game/machinery/bots/floorbot.dm b/code/game/machinery/bots/floorbot.dm index cd9dca6d6af..c05475660eb 100644 --- a/code/game/machinery/bots/floorbot.dm +++ b/code/game/machinery/bots/floorbot.dm @@ -75,7 +75,7 @@ usr.set_machine(src) interact(user) -/obj/machinery/bot/floorbot/proc/interact(mob/user as mob) +/obj/machinery/bot/floorbot/interact(mob/user as mob) var/dat dat += "Automatic Station Floor Repairer v1.0

" dat += "Status: [src.on ? "On" : "Off"]
" diff --git a/code/game/machinery/bots/mulebot.dm b/code/game/machinery/bots/mulebot.dm index 5785194a47e..abbaa6b02d7 100644 --- a/code/game/machinery/bots/mulebot.dm +++ b/code/game/machinery/bots/mulebot.dm @@ -202,7 +202,7 @@ user.set_machine(src) 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 dat += "Multiple Utility Load Effector Mk. III

" dat += "ID: [suffix]
" diff --git a/code/game/machinery/bots/secbot.dm b/code/game/machinery/bots/secbot.dm index 464625768bb..3f0b99d227b 100644 --- a/code/game/machinery/bots/secbot.dm +++ b/code/game/machinery/bots/secbot.dm @@ -102,7 +102,7 @@ usr.set_machine(src) interact(user) -/obj/machinery/bot/secbot/proc/interact(mob/user as mob) +/obj/machinery/bot/secbot/interact(mob/user as mob) var/dat dat += text({" diff --git a/code/game/machinery/camera/wires.dm b/code/game/machinery/camera/wires.dm index 4e274c6da6f..13f0a858616 100644 --- a/code/game/machinery/camera/wires.dm +++ b/code/game/machinery/camera/wires.dm @@ -98,7 +98,7 @@ 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) return diff --git a/code/game/machinery/computer/Operating.dm b/code/game/machinery/computer/Operating.dm index 04df02260ab..e0d46ad790c 100644 --- a/code/game/machinery/computer/Operating.dm +++ b/code/game/machinery/computer/Operating.dm @@ -30,7 +30,7 @@ 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 (!istype(user, /mob/living/silicon)) user.unset_machine() diff --git a/code/game/machinery/computer/crew.dm b/code/game/machinery/computer/crew.dm index 9a403c95b25..a4cbf96dd25 100644 --- a/code/game/machinery/computer/crew.dm +++ b/code/game/machinery/computer/crew.dm @@ -53,67 +53,66 @@ return - proc - interact(mob/user) - if( (get_dist(src, user) > 1 ) || (stat & (BROKEN|NOPOWER)) ) - if(!istype(user, /mob/living/silicon)) - user.unset_machine() - user << browse(null, "window=powcomp") - return - user.set_machine(src) - src.scan() - var/t = "Crew Monitoring
" - t += "
Refresh " - t += "Close
" - t += "" - var/list/logs = list() - for(var/obj/item/clothing/under/C in src.tracked) - var/log = "" - var/turf/pos = get_turf(C) - if((C) && (C.has_sensor) && (pos) && (pos.z == src.z) && C.sensor_mode) - if(istype(C.loc, /mob/living/carbon/human)) + interact(mob/user) + if( (get_dist(src, user) > 1 ) || (stat & (BROKEN|NOPOWER)) ) + if(!istype(user, /mob/living/silicon)) + user.unset_machine() + user << browse(null, "window=powcomp") + return + user.set_machine(src) + src.scan() + var/t = "Crew Monitoring
" + t += "
Refresh " + t += "Close
" + t += "
NameVitalsPosition
" + var/list/logs = list() + for(var/obj/item/clothing/under/C in src.tracked) + var/log = "" + var/turf/pos = get_turf(C) + if((C) && (C.has_sensor) && (pos) && (pos.z == src.z) && C.sensor_mode) + 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/dam2 = round(H.getToxLoss(),1) - var/dam3 = round(H.getFireLoss(),1) - var/dam4 = round(H.getBruteLoss(),1) + var/dam1 = round(H.getOxyLoss(),1) + var/dam2 = round(H.getToxLoss(),1) + var/dam3 = round(H.getFireLoss(),1) + var/dam4 = round(H.getBruteLoss(),1) - var/life_status = "[H.stat > 1 ? "Deceased" : "Living"]" - var/damage_report = "([dam1]/[dam2]/[dam3]/[dam4])" + var/life_status = "[H.stat > 1 ? "Deceased" : "Living"]" + var/damage_report = "([dam1]/[dam2]/[dam3]/[dam4])" - if(H.wear_id) - log += "" - else - log += "" + if(H.wear_id) + log += "" + else + log += "" - switch(C.sensor_mode) - if(1) - log += "" - if(2) - log += "" - if(3) - var/area/player_area = get_area(H) - log += "" - logs += log - logs = sortList(logs) - for(var/log in logs) - t += log - t += "
NameVitalsPosition
[H.wear_id.name]
Unknown
[H.wear_id.name]
Unknown[life_status]Not Available
[life_status] [damage_report]Not Available
[life_status] [damage_report][player_area.name] ([pos.x], [pos.y])
" - t += "" - user << browse(t, "window=crewcomp;size=900x600") - onclose(user, "crewcomp") + switch(C.sensor_mode) + if(1) + log += "[life_status]Not Available" + if(2) + log += "[life_status] [damage_report]Not Available" + if(3) + var/area/player_area = get_area(H) + log += "[life_status] [damage_report][player_area.name] ([pos.x], [pos.y])" + logs += log + logs = sortList(logs) + for(var/log in logs) + t += log + t += "" + t += "" + user << browse(t, "window=crewcomp;size=900x600") + onclose(user, "crewcomp") - scan() - for(var/obj/item/clothing/under/C in world) - if((C.has_sensor) && (istype(C.loc, /mob/living/carbon/human))) - var/check = 0 - for(var/O in src.tracked) - if(O == C) - check = 1 - break - if(!check) - src.tracked.Add(C) - return 1 \ No newline at end of file + proc/scan() + for(var/obj/item/clothing/under/C in world) + if((C.has_sensor) && (istype(C.loc, /mob/living/carbon/human))) + var/check = 0 + for(var/O in src.tracked) + if(O == C) + check = 1 + break + if(!check) + src.tracked.Add(C) + return 1 \ No newline at end of file diff --git a/code/game/machinery/computer/power.dm b/code/game/machinery/computer/power.dm index 7f1d6d25148..ce441f00d0b 100644 --- a/code/game/machinery/computer/power.dm +++ b/code/game/machinery/computer/power.dm @@ -68,7 +68,7 @@ src.attack_hand(user) 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 (!istype(user, /mob/living/silicon)) diff --git a/code/game/machinery/computer/station_alert.dm b/code/game/machinery/computer/station_alert.dm index 5cc5b7aae91..35e80f54e7a 100644 --- a/code/game/machinery/computer/station_alert.dm +++ b/code/game/machinery/computer/station_alert.dm @@ -23,7 +23,7 @@ return - proc/interact(mob/user) + interact(mob/user) usr.set_machine(src) var/dat = "Current Station Alerts\n" dat += "Close

" diff --git a/code/game/machinery/kitchen/juicer.dm b/code/game/machinery/kitchen/juicer.dm index 88014be32ad..b237f8223f6 100644 --- a/code/game/machinery/kitchen/juicer.dm +++ b/code/game/machinery/kitchen/juicer.dm @@ -62,7 +62,7 @@ user.set_machine(src) 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_beaker_ready = 0 var/processing_chamber = "" diff --git a/code/game/machinery/kitchen/microwave.dm b/code/game/machinery/kitchen/microwave.dm index e5fc9e8be00..d25e1ecc145 100644 --- a/code/game/machinery/kitchen/microwave.dm +++ b/code/game/machinery/kitchen/microwave.dm @@ -146,7 +146,7 @@ * 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 = "" if(src.broken > 0) dat = {"Bzzzzttttt"} diff --git a/code/game/machinery/kitchen/smartfridge.dm b/code/game/machinery/kitchen/smartfridge.dm index 45f18cab291..2c027f2e6cd 100644 --- a/code/game/machinery/kitchen/smartfridge.dm +++ b/code/game/machinery/kitchen/smartfridge.dm @@ -89,7 +89,7 @@ * SmartFridge Menu ********************/ -/obj/machinery/smartfridge/proc/interact(mob/user as mob) +/obj/machinery/smartfridge/interact(mob/user as mob) if(!src.ispowered) return diff --git a/code/game/machinery/navbeacon.dm b/code/game/machinery/navbeacon.dm index c5ee41c4cf0..71f450e70fe 100644 --- a/code/game/machinery/navbeacon.dm +++ b/code/game/machinery/navbeacon.dm @@ -132,7 +132,7 @@ attack_hand(var/mob/user) interact(user, 0) - proc/interact(var/mob/user, var/ai = 0) + interact(var/mob/user, var/ai = 0) var/turf/T = loc if(T.intact) return // prevent intraction when T-scanner revealed diff --git a/code/game/objects/items/blueprints.dm b/code/game/objects/items/blueprints.dm index 9d1ea766478..e755082ff09 100644 --- a/code/game/objects/items/blueprints.dm +++ b/code/game/objects/items/blueprints.dm @@ -44,7 +44,7 @@ return edit_area() -/obj/item/blueprints/proc/interact() +/obj/item/blueprints/interact() var/area/A = get_area() var/text = {"[src]

[station_name()] blueprints

diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index 40c8fcdc89f..5b9bbc1c749 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -152,7 +152,7 @@ var/produce_heat = 1500 /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() diff --git a/code/game/objects/items/devices/radio/radio.dm b/code/game/objects/items/devices/radio/radio.dm index 26113ad6b41..13712cd4411 100644 --- a/code/game/objects/items/devices/radio/radio.dm +++ b/code/game/objects/items/devices/radio/radio.dm @@ -74,7 +74,7 @@ var/GLOBAL_RADIO_TYPE = 1 // radio type to use user.set_machine(src) interact(user) -/obj/item/device/radio/proc/interact(mob/user as mob) +/obj/item/device/radio/interact(mob/user as mob) if(!on) return diff --git a/code/game/objects/items/devices/uplinks.dm b/code/game/objects/items/devices/uplinks.dm index 35735fc86f3..7d5a3f7e649 100644 --- a/code/game/objects/items/devices/uplinks.dm +++ b/code/game/objects/items/devices/uplinks.dm @@ -294,7 +294,7 @@ A list of items and costs is stored under the datum of every game mode, alongsid return 0 // 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 = "" dat += src.generate_menu() diff --git a/code/game/objects/items/stacks/stack.dm b/code/game/objects/items/stacks/stack.dm index e173ac29eec..126dc39e929 100644 --- a/code/game/objects/items/stacks/stack.dm +++ b/code/game/objects/items/stacks/stack.dm @@ -34,7 +34,7 @@ /obj/item/stack/attack_self(mob/user as mob) interact(user) -/obj/item/stack/proc/interact(mob/user as mob) +/obj/item/stack/interact(mob/user as mob) if (!recipes) return if (!src || amount<=0) diff --git a/code/game/objects/objs.dm b/code/game/objects/objs.dm index ced037e422c..9b72f8cda04 100644 --- a/code/game/objects/objs.dm +++ b/code/game/objects/objs.dm @@ -79,12 +79,14 @@ for(var/mob/M in nearby) if ((M.client && M.machine == src)) is_in_use = 1 - src.attack_hand(M) + src.interact(M) var/ai_in_use = AutoUpdateAI(src) if(!ai_in_use && !is_in_use) in_use = 0 +/obj/proc/interact(mob/user) + return /obj/proc/update_icon() return diff --git a/code/modules/assembly/assembly.dm b/code/modules/assembly/assembly.dm index 143ca567b97..cd27eaa169b 100644 --- a/code/modules/assembly/assembly.dm +++ b/code/modules/assembly/assembly.dm @@ -46,7 +46,7 @@ proc/holder_movement() //Called when the holder is moved 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 diff --git a/code/modules/power/antimatter/control.dm b/code/modules/power/antimatter/control.dm index 8152b2101dd..61c6cabb92e 100644 --- a/code/modules/power/antimatter/control.dm +++ b/code/modules/power/antimatter/control.dm @@ -260,7 +260,7 @@ 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(!istype(user, /mob/living/silicon/ai)) user.unset_machine() diff --git a/code/modules/power/apc.dm b/code/modules/power/apc.dm index 86af9991e12..61e2547fbb2 100644 --- a/code/modules/power/apc.dm +++ b/code/modules/power/apc.dm @@ -438,10 +438,12 @@ /obj/machinery/power/apc/attack_hand(mob/user) // if (!can_use(user)) This already gets called in interact() and in topic() // return + if(!user) + return src.add_fingerprint(user) - if(opened && (!issilicon(user))) + if(usr == user && opened && (!issilicon(user))) if(cell) - usr.put_in_hands(cell) + user.put_in_hands(cell) cell.add_fingerprint(user) cell.updateicon() @@ -450,7 +452,7 @@ //user << "You remove the power cell." charging = 0 src.updateicon() - return + return if(stat & (BROKEN|MAINT)) return @@ -488,7 +490,7 @@ -/obj/machinery/power/apc/proc/interact(mob/user) +/obj/machinery/power/apc/interact(mob/user) if(!user) return diff --git a/code/modules/power/generator.dm b/code/modules/power/generator.dm index 890f0b02831..7176e18f219 100644 --- a/code/modules/power/generator.dm +++ b/code/modules/power/generator.dm @@ -121,7 +121,7 @@ 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))) user.unset_machine() user << browse(null, "window=teg") diff --git a/code/modules/power/generator_type2.dm b/code/modules/power/generator_type2.dm index e4c57556ac9..cb9313306a1 100644 --- a/code/modules/power/generator_type2.dm +++ b/code/modules/power/generator_type2.dm @@ -98,7 +98,7 @@ 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))) user.unset_machine() user << browse(null, "window=teg") diff --git a/code/modules/power/port_gen.dm b/code/modules/power/port_gen.dm index 9ca25073903..bebbd23912a 100644 --- a/code/modules/power/port_gen.dm +++ b/code/modules/power/port_gen.dm @@ -236,7 +236,7 @@ display round(lastgen) and plasmatank amount /obj/machinery/power/port_gen/pacman/attack_paw(mob/user as mob) 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 (!istype(user, /mob/living/silicon/ai)) user.unset_machine() diff --git a/code/modules/power/singularity/particle_accelerator/particle_control.dm b/code/modules/power/singularity/particle_accelerator/particle_control.dm index 08b13dce286..ebc1ab5b1dc 100644 --- a/code/modules/power/singularity/particle_accelerator/particle_control.dm +++ b/code/modules/power/singularity/particle_accelerator/particle_control.dm @@ -202,7 +202,7 @@ 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(!istype(user, /mob/living/silicon)) user.unset_machine() diff --git a/code/modules/power/smes.dm b/code/modules/power/smes.dm index 0f67afe41ec..fed1cb5e7f4 100644 --- a/code/modules/power/smes.dm +++ b/code/modules/power/smes.dm @@ -178,7 +178,7 @@ 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)) user.unset_machine() user << browse(null, "window=smes") diff --git a/code/modules/power/solar.dm b/code/modules/power/solar.dm index 512d721a539..49e10ad35dc 100644 --- a/code/modules/power/solar.dm +++ b/code/modules/power/solar.dm @@ -171,7 +171,6 @@ tracker_update(var/angle) set_panels(var/cdir) broken() - interact(mob/user) New() diff --git a/code/modules/reagents/Chemistry-Machinery.dm b/code/modules/reagents/Chemistry-Machinery.dm index be6a5fd9bbe..aafa471762e 100644 --- a/code/modules/reagents/Chemistry-Machinery.dm +++ b/code/modules/reagents/Chemistry-Machinery.dm @@ -828,7 +828,7 @@ user.set_machine(src) 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_beaker_ready = 0 var/processing_chamber = "" diff --git a/code/modules/recycling/disposal.dm b/code/modules/recycling/disposal.dm index fdab79548d6..d5e8e1a4168 100644 --- a/code/modules/recycling/disposal.dm +++ b/code/modules/recycling/disposal.dm @@ -215,7 +215,7 @@ interact(user, 0) // user interaction - proc/interact(mob/user, var/ai=0) + interact(mob/user, var/ai=0) src.add_fingerprint(user) if(stat & BROKEN) diff --git a/html/changelog.html b/html/changelog.html index be2963b6d20..0a799a01f55 100644 --- a/html/changelog.html +++ b/html/changelog.html @@ -49,6 +49,15 @@ should be listed in the changelog upon commit tho. Thanks. --> +
+

03 November 2012

+

TankNut updated:

+ +
+

03 November 2012

WJohnston updated:

diff --git a/icons/mob/mob.dmi b/icons/mob/mob.dmi index 7701f6835f9..09e29051f07 100644 Binary files a/icons/mob/mob.dmi and b/icons/mob/mob.dmi differ diff --git a/icons/obj/power.dmi b/icons/obj/power.dmi index 82459fdfc5c..7d7208cd954 100644 Binary files a/icons/obj/power.dmi and b/icons/obj/power.dmi differ