PsiOmega
3eef1796d2
Removes world messages.
2014-12-12 19:49:30 +01:00
PsiOmegaDelta
012d2739d4
Merge pull request #7407 from Amunak/patch-1
...
Fixes dead join/leave message format.
2014-12-12 10:51:01 +01:00
PsiOmegaDelta
4cbfbe4bfa
Merge pull request #7411 from Amunak/patch-2
...
Changed bloodpack crate path in supplypacks.dm
2014-12-12 09:02:50 +01:00
Zuhayr
9e1ef283b1
Merge pull request #7403 from PsiOmegaDelta/RoundEnd
...
Cuts down round-start summary.
2014-12-12 14:15:11 +10:30
Zuhayr
3a475322e7
Merge pull request #7402 from PsiOmegaDelta/BrokenSpan
...
Fixes broken span statement.
2014-12-12 14:14:26 +10:30
Zuhayr
9d2fc50e75
Merge pull request #7397 from PsiOmegaDelta/TotallyRad
...
Halves radiation storm duration.
2014-12-12 14:14:02 +10:30
Zuhayr
b1ff8a8d70
Merge pull request #7394 from PsiOmegaDelta/SMES
...
Fixes #7293 (or tries to)
2014-12-12 14:13:20 +10:30
Zuhayr
b90b135010
Merge pull request #7393 from PsiOmegaDelta/DeclaringReady
...
Ready-button consistency.
2014-12-12 14:12:38 +10:30
Zuhayr
1ac3eef841
Merge pull request #7380 from PsiOmegaDelta/WikiUrl
...
Fixes #7378 .
2014-12-12 14:11:26 +10:30
Zuhayr
8ccca9a020
Merge pull request #7379 from PsiOmegaDelta/Stalkerism
...
Fixes #7366 .
2014-12-12 14:10:55 +10:30
Zuhayr
1291fe9565
Merge pull request #7376 from PsiOmegaDelta/BeepBeep
...
Fixes #7374 .
2014-12-12 14:10:39 +10:30
Zuhayr
44b23fe1b5
Merge pull request #7370 from Hubblenaut/dev-freeze
...
Context-based Combat Fixes
2014-12-12 14:10:23 +10:30
Amunak
74ac8caecd
Changed bloodpack crate path in supplypacks.dm
...
It's now /datum/supply_packs/bloodpack
2014-12-12 01:37:10 +01:00
Amunak
f1a596e168
Fixes dead join/leave message format.
...
Fixes dead join/leave message format when the mind name is empty.
It used to show ' (Character Name) no longer...' instead of 'Mind Name (Character Name)' where appropriate.
2014-12-11 22:10:22 +01:00
PsiOmega
f97e047e3c
Unconscious entities no longer considered dead.
2014-12-11 21:05:28 +01:00
PsiOmega
1e4572afd6
Cuts down round-start summary.
...
Now only lists entities with names and assignments.
2014-12-11 19:09:57 +01:00
PsiOmega
18ee756ca2
Fixes broken span statement.
...
Adds a proper class and closer.
2014-12-11 19:05:59 +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
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
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
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
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
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
5730bcb885
Merged master/dev config.txt.
2014-12-10 16:35:39 +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
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
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
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
