Amunak
94a93ac97d
Reverted accidental changes to SMES building and RCON research
2014-12-11 11:27:01 +01:00
PsiOmega
95db71f5cd
Drastically reduces radiation storm duration.
...
Numbers were previously based on the assumption that the default number of master ticks were 10 rather than 20.
2014-12-11 10:36:15 +01:00
PsiOmegaDelta
c66cc1ac5e
Merge pull request #7387 from mwerezak/alarms
...
Fixes #7354
2014-12-11 10:25:06 +01:00
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
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
323cc56a89
Topic fix.
2014-12-11 05:01:06 +03:00
Segrain
2582ef02b8
Namefix.
2014-12-11 05:00:31 +03:00
Hubblenaut
55355cc77d
Context-based Combat Fixes
2014-12-11 00:25:52 +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
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
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
Zuhayr
5730bcb885
Merged master/dev config.txt.
2014-12-10 16:35:39 +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
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
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
Zuhayr
bc394b72d6
Fixes diona and simple_animals eating snacks.
2014-12-09 22:14:41 +10:30
Segrain
4ae3d3029f
Fix for #6643 .
2014-12-09 14:54:20 +03:00
Segrain
065d9b110c
Fix for #6476 .
2014-12-09 14:52:43 +03:00
PsiOmegaDelta
63a5d009c7
Merge pull request #7267 from GinjaNinja32/noise
...
Audible emote improvement, adds ability to emote over radio.
2014-12-09 11:54:57 +01:00
Zuhayr
7bc72fb836
Tidied up/fixed up the rig back icons.
2014-12-09 21:01:17 +10:30
Zuhayr
ff2c23714f
Bunch of diona nymph tweaks/fixes.
2014-12-09 20:52:41 +10:30
Loganbacca
2b98f70f9f
Science goggles overlay fix
2014-12-09 22:05:14 +13:00
PsiOmega
48aeefa85a
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/game/gamemodes/cult/talisman.dm
maps/exodus-1.dmm
2014-12-09 09:42:14 +01:00
PsiOmega
924955a4c8
Merge remote-tracking branch 'upstream/master' into dev-freeze
2014-12-09 09:07:38 +01:00
Segrain
4b7b910311
Fix for #7324 .
2014-12-09 09:39:05 +03:00
PsiOmegaDelta
f9e59d430b
Merge pull request #7329 from mwerezak/talisman
...
Adds image for cult talismans
2014-12-09 07:26:10 +01:00
Neerti
4fcd9e6924
Resolves conflicts, I hope.
2014-12-08 20:46:55 -05:00
