Commit Graph

17065 Commits

Author SHA1 Message Date
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
Zuhayr
53627175ef Merge pull request #7347 from Baystation12/master
Updating dev-freeze from master.
2014-12-10 03:21:56 +10:30
Ccomp5950
cab064cd16 Merge pull request #7340 from Zuhayr/dev-freeze
Dev-freeze fixes.
2014-12-09 11:48:33 -05:00
Zuhayr
90f5da4e83 Merge pull request #7333 from PsiOmegaDelta/RadioWiresAreNotForYou
Fixes #7323.
2014-12-10 03:15:28 +10:30
PsiOmegaDelta
5842c17536 Merge pull request #7338 from Loganbacca/tapefix
Tape fixes
2014-12-09 17:44:23 +01:00
Zuhayr
61cb862690 Merge pull request #7300 from PsiOmegaDelta/RoundEnd
Fixes #7295.
2014-12-10 03:11:38 +10:30
Zuhayr
4aa7c072ca Merge pull request #7337 from Loganbacca/glassesfix
Science goggles overlay fix
2014-12-10 03:11:18 +10:30
PsiOmegaDelta
41cca1b250 Merge pull request #7303 from TwistedAkai/dev
Implements existing assistant alternate job titles
2014-12-09 17:34:31 +01:00
Zuhayr
39f303c50e Actually fixes hardsuit back icons. 2014-12-10 02:37:23 +10:30
Zuhayr
fea8868753 Fixes #7310 and should also fix #7311 2014-12-10 02:28:03 +10:30
Zuhayr
e80f59742d Fixes #7316 2014-12-10 00:56:26 +10:30
Amunak
e068d9f8d4 Blast doors' sprite now doesn't disappear when damaged - fixes #7341 2014-12-09 14:50:36 +01:00
Zuhayr
bc394b72d6 Fixes diona and simple_animals eating snacks. 2014-12-09 22:14:41 +10:30
Segrain
4fb83010e1 Fix for #7322. 2014-12-09 14:55:25 +03:00
Segrain
4ae3d3029f Fix for #6643. 2014-12-09 14:54:20 +03:00