Permalink
Browse files

Merge branch 'master' of https://github.com/tgstation/-tg-station int…

…o NanoSMES

Thanks Razharas, hehe
Merge new SMES vars and Nanou in with constructable SMES and whatnot
  • Loading branch information...
2 parents a5eb0b5 + 863e6aa commit 6488b34533d4b502546167ab2f5a17ff0a81eded @MrPerson MrPerson committed Feb 8, 2014
Showing with 2,362 additions and 1,717 deletions.
  1. +4 −4 _maps/map_files/MiniStation/MiniStation.dmm
  2. +1 −0 code/ATMOSPHERICS/components/unary/unary_base.dm
  3. +4 −1 code/game/atoms.dm
  4. +2 −17 code/game/dna.dm
  5. +8 −8 code/game/gamemodes/events.dm
  6. +204 −137 code/game/machinery/Freezer.dm
  7. +142 −262 code/game/machinery/Sleeper.dm
  8. +2 −1 code/game/machinery/autolathe.dm
  9. +3 −11 code/game/machinery/cloning.dm
  10. +26 −26 code/game/machinery/computer/aifixer.dm
  11. +8 −1 code/game/machinery/computer/buildandrepair.dm
  12. +6 −1 code/game/machinery/computer/cloning.dm
  13. +177 −0 code/game/machinery/constructable_frame.dm
  14. +101 −143 code/game/machinery/cryo.dm
  15. +4 −1 code/game/machinery/kitchen/gibber.dm
  16. +4 −1 code/game/machinery/kitchen/juicer.dm
  17. +49 −23 code/game/machinery/kitchen/microwave.dm
  18. +3 −0 code/game/machinery/kitchen/monkeyrecycler.dm
  19. +2 −0 code/game/machinery/kitchen/processor.dm
  20. +2 −0 code/game/machinery/kitchen/smartfridge.dm
  21. +79 −20 code/game/machinery/machinery.dm
  22. +49 −7 code/game/machinery/newscaster.dm
  23. +37 −37 code/game/machinery/rechargestation.dm
  24. +274 −270 code/game/machinery/teleporter.dm
  25. +12 −2 code/game/machinery/vending.dm
  26. +90 −183 code/game/mecha/mech_bay.dm
  27. +12 −5 code/game/mecha/mech_fabricator.dm
  28. +2 −2 code/game/objects/items/weapons/clown_items.dm
  29. +0 −1 code/game/objects/items/weapons/implants/implantchair.dm
  30. +5 −6 code/game/objects/items/weapons/teleportation.dm
  31. +5 −0 code/game/objects/structures/mineral_doors.dm
  32. +7 −3 code/game/objects/structures/transit_tubes.dm
  33. +1 −1 code/game/turfs/simulated.dm
  34. +5 −0 code/game/turfs/simulated/walls.dm
  35. +5 −0 code/game/turfs/simulated/walls_reinforced.dm
  36. +3 −0 code/game/turfs/space/space.dm
  37. +14 −1 code/game/turfs/turf.dm
  38. +1 −1 code/modules/events/alien_infestation.dm
  39. +1 −1 code/modules/events/spider_infestation.dm
  40. +14 −12 code/modules/events/vent_clog.dm
  41. +94 −59 code/modules/hydroponics/biogenerator.dm
  42. +6 −1 code/modules/mob/living/carbon/carbon.dm
  43. +0 −15 code/modules/mob/living/carbon/human/human_damage.dm
  44. +27 −27 code/modules/power/apc.dm
  45. +20 −0 code/modules/power/cable.dm
  46. +113 −88 code/modules/power/smes.dm
  47. +7 −1 code/modules/power/solar.dm
  48. +77 −12 code/modules/power/turbine.dm
  49. +10 −9 code/modules/projectiles/projectile.dm
  50. +67 −2 code/modules/reagents/Chemistry-Machinery.dm
  51. +1 −1 code/modules/reagents/Chemistry-Reagents.dm
  52. +9 −4 code/modules/reagents/reagent_containers/spray.dm
  53. +3 −13 code/modules/research/circuitprinter.dm
  54. +157 −22 code/modules/research/designs.dm
  55. +4 −9 code/modules/research/destructive_analyzer.dm
  56. +2 −3 code/modules/research/protolathe.dm
  57. +181 −161 code/modules/research/rdconsole.dm
  58. +2 −3 code/modules/research/server.dm
  59. +3 −0 code/modules/telesci/gps.dm
  60. +32 −0 code/modules/telesci/telepad.dm
  61. +86 −45 code/modules/telesci/telesci_computer.dm
  62. BIN icons/mecha/mech_bay.dmi
  63. BIN icons/obj/Cryogenic2.dmi
  64. BIN icons/obj/biogenerator.dmi
  65. BIN icons/obj/chemical.dmi
  66. BIN icons/obj/cryogenics.dmi
  67. BIN icons/obj/items.dmi
  68. BIN icons/obj/kitchen.dmi
  69. BIN icons/obj/pipes/transit_tube.dmi
  70. BIN icons/obj/power.dmi
  71. BIN icons/obj/stationobjs.dmi
  72. BIN icons/obj/telescience.dmi
  73. +5 −3 nano/templates/cryo.tmpl
  74. +88 −50 nano/templates/smes.tmpl
@@ -1414,15 +1414,15 @@
"aBj" = (/obj/machinery/atmospherics/pipe/simple{pipe_color = "yellow"; icon_state = "intact-y"; level = 2},/turf/simulated/floor/plating,/area/engine/engineering)
"aBk" = (/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 4},/area/engine/engineering)
"aBl" = (/obj/machinery/light/small{dir = 1},/turf/simulated/floor,/area/engine/engineering)
-"aBm" = (/obj/structure/transit_tube{tag = "icon-D-Block"; icon_state = "D-Block"},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 8},/area/engine/engineering)
+"aBm" = (/obj/structure/transit_tube{tag = "icon-Block"; icon_state = "Block"},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 8},/area/engine/engineering)
"aBn" = (/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 10},/area/engine/engineering)
"aBo" = (/obj/machinery/atmospherics/pipe/simple{pipe_color = "cyan"; icon_state = "intact-c"},/obj/machinery/meter,/turf/simulated/floor/plating,/area/engine/engineering)
"aBp" = (/obj/machinery/atmospherics/pipe/simple{pipe_color = "cyan"; icon_state = "intact-c"},/obj/machinery/meter,/turf/simulated/floor/plating{icon_state = "warnplatecorner"; dir = 2},/area/engine/engineering)
"aBq" = (/obj/item/weapon/paper/generator,/obj/item/device/multitool,/turf/simulated/floor/plating{dir = 2; icon_state = "warnplate"},/area/engine/engineering)
"aBr" = (/obj/machinery/atmospherics/pipe/simple{pipe_color = "yellow"; icon_state = "intact-y"; level = 2},/obj/machinery/meter,/turf/simulated/floor/plating{icon_state = "warnplatecorner"; dir = 1},/area/engine/engineering)
"aBs" = (/obj/machinery/atmospherics/pipe/simple{pipe_color = "yellow"; icon_state = "intact-y"; level = 2},/obj/machinery/meter,/turf/simulated/floor/plating,/area/engine/engineering)
"aBt" = (/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 6},/area/engine/engineering)
-"aBu" = (/obj/structure/transit_tube_pod,/obj/structure/transit_tube/station/reverse{tag = "icon-closed (EAST)"; icon_state = "closed"; dir = 4},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 8},/area/engine/engineering)
+"aBu" = (/obj/structure/transit_tube/station/reverse{dir = 8; icon_state = "closed"; tag = "icon-closed (EAST)"},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 8},/area/engine/engineering)
"aBv" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 4},/turf/simulated/wall,/area/engine/engineering)
"aBw" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 9},/obj/structure/closet/secure_closet/engineering_electrical,/turf/simulated/floor,/area/engine/engineering)
"aBx" = (/obj/machinery/alarm{dir = 1; icon_state = "alarm0"; pixel_y = -22},/turf/simulated/floor,/area/engine/engineering)
@@ -1437,7 +1437,7 @@
"aBG" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/wall,/area/engine/engineering)
"aBH" = (/obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{dir = 4},/turf/simulated/floor,/area/engine/engineering)
"aBI" = (/obj/machinery/light/small,/turf/simulated/floor,/area/engine/engineering)
-"aBJ" = (/obj/structure/transit_tube{icon_state = "N-S"},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 8},/area/engine/engineering)
+"aBJ" = (/obj/structure/transit_tube{icon_state = "N-S"},/obj/structure/transit_tube_pod,/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 8},/area/engine/engineering)
"aBK" = (/obj/structure/reagent_dispensers/fueltank,/obj/machinery/camera/autoname,/turf/simulated/floor,/area/engine/engineering)
"aBL" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/machinery/atmospherics/pipe/simple{pipe_color = "cyan"; icon_state = "intact-c"},/turf/simulated/floor/plating,/area/engine/engineering)
"aBM" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced{dir = 4},/obj/structure/window/reinforced,/obj/machinery/atmospherics/pipe/simple{pipe_color = "cyan"; icon_state = "intact-c"},/turf/simulated/floor/plating,/area/engine/engineering)
@@ -1613,7 +1613,7 @@
"aFa" = (/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/obj/machinery/meter,/turf/simulated/floor/plating,/area/tcommsat/computer)
"aFb" = (/obj/structure/grille,/obj/structure/window/reinforced{dir = 8},/obj/structure/window/reinforced{dir = 1},/obj/structure/window/reinforced,/obj/structure/window/reinforced{dir = 4},/obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{dir = 4},/turf/simulated/floor/plating,/area/tcommsat/computer)
"aFc" = (/obj/machinery/atmospherics/pipe/vent{dir = 8},/turf/simulated/floor/plating/airless,/area)
-"aFd" = (/obj/structure/transit_tube{tag = "icon-D-Block (NORTH)"; icon_state = "D-Block"; dir = 1},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 4},/area/tcommsat/computer)
+"aFd" = (/obj/structure/transit_tube{tag = "icon-Block (NORTH)"; icon_state = "Block"; dir = 1},/turf/simulated/floor/plating{icon_state = "warnplate"; dir = 4},/area/tcommsat/computer)
"aFe" = (/obj/machinery/atmospherics/unary/vent_pump{dir = 4; on = 1},/turf/simulated/floor/plating,/area/tcommsat/computer)
"aFf" = (/obj/machinery/atmospherics/pipe/simple/supply/hidden{dir = 10},/turf/simulated/wall/r_wall,/area/tcommsat/computer)
"aFg" = (/obj/machinery/camera/autoname{dir = 4; network = list("SS13")},/turf/simulated/floor/bluegrid{name = "Mainframe Base"; nitrogen = 100; oxygen = 0; temperature = 80},/area/tcommsat/computer)
@@ -48,6 +48,7 @@
if(target.initialize_directions & get_dir(target,src))
node = target
break
+ build_network()
update_icon()
View
@@ -364,4 +364,7 @@ var/list/blood_splatter_icons = list()
if(istype(get_turf(src), /turf/space))
return 1
else
- return 0
+ return 0
+
+/atom/proc/handle_fall()
+ return
View
@@ -331,7 +331,6 @@
density = 1
var/locked = 0
var/open = 0
- var/mob/occupant = null
anchored = 1
use_power = 1
idle_power_usage = 50
@@ -454,28 +453,14 @@
/obj/machinery/dna_scannernew/attackby(obj/item/weapon/grab/G, mob/user)
- if(istype(G, /obj/item/weapon/screwdriver))
- if(occupant)
- user << "<span class='notice'>The maintenance panel is locked.</span>"
- return
- playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
- panel_open = !panel_open
- if(panel_open)
- icon_state = "[icon_state]_maintenance"
- user << "<span class='notice'>You open the maintenance panel of [src].</span>"
- else
- if(open)
- icon_state = "[initial(icon_state)]_open"
- else
- icon_state = "[initial(icon_state)]"
- user << "<span class='notice'>You close the maintenance panel of [src].</span>"
+ if(!occupant && default_deconstruction_screwdriver(user, "[initial(icon_state)]_open", "[initial(icon_state)]", G))
return
if(istype(G, /obj/item/weapon/crowbar))
if(panel_open)
for(var/obj/I in contents) // in case there is something in the scanner
I.loc = src.loc
- default_deconstruction_crowbar()
+ default_deconstruction_crowbar(G)
return
if(!istype(G, /obj/item/weapon/grab) || !ismob(G.affecting))
@@ -82,8 +82,8 @@
continue
S.charge = 0
S.output_level = 0
- S.outputting = 0
- S.updateicon()
+ S.output_attempt = 0
+ S.update_icon()
S.power_change()
var/list/skipped_areas = list(/area/engine/engineering, /area/turret_protected/ai)
@@ -133,9 +133,9 @@
if(S.z != 1)
continue
S.charge = S.capacity
- S.output_level = 200000
- S.outputting = 1
- S.updateicon()
+ S.output_level = S.output_level_max
+ S.output_attempt = 1
+ S.update_icon()
S.power_change()
for(var/area/A in world)
if(A.name != "Space" && A.name != "Engine Walls" && A.name != "Chemical Lab Test Chamber" && A.name != "space" && A.name != "Escape Shuttle" && A.name != "Arrival Area" && A.name != "Arrival Shuttle" && A.name != "start area" && A.name != "Engine Combustion Chamber")
@@ -153,8 +153,8 @@
if(S.z != 1)
continue
S.charge = S.capacity
- S.output_level = 200000
- S.outputting = 1
- S.updateicon()
+ S.output_level = S.output_level_max
+ S.output_attempt = 1
+ S.update_icon()
S.power_change()
Oops, something went wrong.

0 comments on commit 6488b34

Please sign in to comment.