PsiOmega
e73e449dcc
Fixes #7293 .
...
Attempts to make SMES less stubborn about refusing to be turned off.
Removes code in Topic() which is handled by parent.
2014-12-11 09:26:34 +01:00
Zuhayr
300a42a658
Fixes #7388
2014-12-11 18:38:02 +10:30
PsiOmega
c587c4d8b0
Ready-button consistency.
...
The Ready/Not Ready options during round now always set the ready flag as according to their name, rather than always toggle.
This prevents the case where (due to heavy load/no processing of dialogs during early client startup) the dialog claim one thing and the lobby status tab another.
2014-12-11 08:44:56 +01:00
PsiOmega
696d275fef
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2014-12-11 08:26:19 +01:00
PsiOmega
8c8480cb26
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/machinery/computer/crew.dm
2014-12-11 08:18:58 +01:00
PsiOmegaDelta
a906d45b3c
Merge pull request #7383 from Segrain/dev-freeze
...
Dev-freeze fixes.
2014-12-11 06:42:44 +01:00
mwerezak
6d3ab9ea46
Fixes #7354
2014-12-11 00:41:44 -05:00
Segrain
0fc7177894
Fix for ghost hearing.
2014-12-11 08:32:27 +03:00
Zuhayr
0c448de7c9
Added Skrell blurb, also added language/species-based random name generator.
2014-12-11 15:28:26 +10:30
Zuhayr
7a3b2b3593
Reverted colours to previous iteration.
2014-12-11 14:20:41 +10:30
Zuhayr
72ea7d9063
Removed the Goon catwalks.
2014-12-11 14:03:59 +10:30
Zuhayr
62c6a4808c
Added a link to the whitelist forums in the new species window.
2014-12-11 13:23:40 +10:30
Zuhayr
bf17614200
Added a new language-scrambling proc for listeners who don't speak the language.
2014-12-11 13:23:26 +10:30
Segrain
b1785edf33
Fix for #7365 .
2014-12-11 05:01:47 +03:00
Segrain
323cc56a89
Topic fix.
2014-12-11 05:01:06 +03:00
Segrain
2582ef02b8
Namefix.
2014-12-11 05:00:31 +03:00
Segrain
944800eee4
Fix for #7352 .
2014-12-11 04:53:24 +03:00
Segrain
9bd818e2a4
Fix for #7351 .
2014-12-11 04:52:35 +03:00
Hubblenaut
55355cc77d
Context-based Combat Fixes
2014-12-11 00:25:52 +01:00
GinjaNinja32
dbf6a2d0ac
Make walls and r-walls use the same proc for hulksmash, allow push towards walls
2014-12-10 22:16:55 +00:00
GinjaNinja32
3968f8b492
All turfs except /turf/simulated/wall can now be clicked to push pulled objects towards them
2014-12-10 22:08:44 +00:00
PsiOmega
0cc7998197
Fixes #7378 .
...
Now uses the config.wikiurl setting instead.
Assumes wikiurl is in an format which can accept titles, in Bay12's case: http://wiki.baystation12.net/index.php?title=
2014-12-10 22:27:19 +01:00
PsiOmega
087cc1882c
Fixes #7366 .
...
Kills unecessary photo datum which wasn't even used correctly anymore.
Photos have a global id for ease of synth syncing.
Changes how law/photo syncing is handled when pulsing the appropriate borg wire.
Also ensures re-synced borgs are added/removed from the appropriate AIs.
2014-12-10 21:54:57 +01:00
Amunak
1e769b4314
Attempt to normalize computer and circuit board names and their research names.
...
Also moved RCON console board and SMES board where they belong. Formatted some board code and fixed some typos, too.
Cloning console renamed to Cloning Control Console.
The teleporter console is now called Teleporter Control Console.
The power monitor is now called Power Monitoring Console.
SMES board glass and acid construction price normalized (though other resources are still required; is that a good thing? It would be better to just introduce a new expensive part that is used to build it (if the coils aren't enough) rather than have a single board with atypical price.
2014-12-10 20:37:18 +01:00
PsiOmega
3a2aed265b
Fixes #7374 .
...
Now checks the correct ringer flag when receiving a PDA message.
2014-12-10 20:25:03 +01:00
PsiOmega
8e5bc3a589
Fixes #7356 .
...
Clam now uses the proper arg name when trying to create borers.
Fixes a minor issue in the event manager, where the wrong Topic arg was used.
2014-12-10 20:11:00 +01:00
Zuhayr
ed29f5ca2b
Added a more interesting/informative species selection window to chargen.
2014-12-11 03:49:28 +10:30
Atlantiscze
0bacf5492e
Final version of Mech Bay Charging Console NanoUI implementation
2014-12-10 15:19:53 +01:00
Atlantiscze
1a6d1eac2f
Compile error fix
2014-12-10 12:42:57 +01:00
Atlantiscze
73b04ff177
Compile error fix
2014-12-10 12:34:23 +01:00
Atlantiscze
43e816895d
v1.0 of NanoUI for mech bay consoles.
2014-12-10 12:32:27 +01:00
PsiOmegaDelta
44e8dd7153
Merge pull request #7359 from GinjaNinja32/machinedir
...
Change unary-atmos machine (heater, freezer) construction to use constructing mob's dir
2014-12-10 11:45:48 +01:00
PsiOmegaDelta
1327808386
Merge pull request #7275 from atlantiscze/substation-features
...
RCON System
2014-12-10 11:45:32 +01:00
Zuhayr
a3dc661c62
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12 into dev
2014-12-10 18:50:31 +10:30
Zuhayr
52152166b3
Wip fixing suit spints.
2014-12-10 18:49:32 +10:30
Neerti
8a99a2b24f
Makes the code compile.
2014-12-10 02:58:01 -05:00
Neerti
c90e9eb931
More merge conflict resolution goodness.
2014-12-10 02:14:58 -05:00
Neerti
a66dbd6fc6
Merge remote-tracking branch 'remotes/upstream/dev' into 12_7_14_holopad_and_emotes
2014-12-10 01:55:50 -05:00
Zuhayr
5730bcb885
Merged master/dev config.txt.
2014-12-10 16:35:39 +10:30
Zuhayr
1481c1e985
Merge pull request #7360 from SkyMarshal/astar-fix
...
Fix/Cleanup for A* implementation
2014-12-10 16:29:55 +10:30
Zuhayr
dda27082ba
Merge pull request #7357 from mwerezak/infinity
...
Prevents infinite loop
2014-12-10 16:29:22 +10:30
ccomp5950
3414e48ceb
Adds "paranoid" option to remove more powerful debug options from R_DEBUG.
...
The purpose of this is to allow for testers on our test server without them having advance proc call which can do some fun stuff with python, etc.
Also removes debug controller so that testers can't just edit the configuration to remove debugparanoid
The default config is the status quo, you have to go out of your way and set this option in config to remove proccal from R_DEBUG
2014-12-09 21:25:07 -05:00
GinjaNinja32
9c1fffc16a
Change unary atmos machine construction to use constructing mob's dir
2014-12-10 01:49:23 +00:00
SkyMarshal
f44a58e358
Fixes the heap fix.
2014-12-09 18:42:54 -07:00
SkyMarshal
d3e64deb06
Fixes a small derp.
2014-12-09 18:42:53 -07:00
SkyMarshal
928a0fcf42
Refactors the AStar code to not be retarded. Works just like it used to.
2014-12-09 18:42:52 -07:00
mwerezak
0a6d1f8c81
Prevents infinite loop if a camera takes a picture of an atom with null in either it's overlays or underlays.
2014-12-09 17:19:02 -05:00
Atlantiscze
3eb6d9f286
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into pewPEWPEWboom
2014-12-09 20:59:28 +01:00
Atlantiscze
389b12091d
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into substation-features
2014-12-09 20:48:56 +01:00
PsiOmega
52e6f96dc7
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2014-12-09 17:55:14 +01:00
