Commit Graph

9416 Commits

Author SHA1 Message Date
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
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
8ccca9a020 Merge pull request #7379 from PsiOmegaDelta/Stalkerism
Fixes #7366.
2014-12-12 14:10:55 +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
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
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
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
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
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
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
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
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
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
mwerezak
81890c968e Adds image for cult talismans
So they aren't blank when examined.
2014-12-08 20:45:15 -05:00
Ccomp5950
d8fb78b711 Merge pull request #7326 from Raptor1628/dev-freeze
Hardsuit Fixes
2014-12-08 20:43:56 -05:00
Ccomp5950
628f040f00 Merge pull request #7318 from sabiram/patch-1
Potentially fixes white sundress
2014-12-08 20:43:25 -05:00
Ccomp5950
4d615fc294 Merge pull request #7271 from Segrain/dev-freeze
Dev-freeze fixes.
2014-12-08 20:40:02 -05:00
Raptor1628
921249a335 Hardsuit Fixes
Should merge now, was missing the .dme. Fixes #7307. Adds helmet cameras
for ERT and nukeops. Fixes incorrect lighting overlays. Fixes a weird
sprite.
2014-12-08 19:12:39 -05:00
sabiram
b27adda1c3 Potentially fixes white sundress 2014-12-08 14:30:03 -05:00
PsiOmegaDelta
e66f5ed765 Merge pull request #7272 from Raptor1628/dev-freeze
Hardsuit Mark Two, more Hulabaloo
2014-12-08 06:45:11 +01:00
Zuhayr
3c66bd3920 Merge resolution. 2014-12-08 13:01:04 +10:30
Raptor1628
75659ab66a Hardsuit Mark Two, more Hulabaloo
Adds all sprites for the nukeop and research hardsuit. Shuffles around
hardsuit spawns and gear so they make sense, especially for the ERT,
they still only have two hardsuits per department, but there are enough
magboots and vests for the people who need the regular armor. Added the
medical hardsuit and its attendant gear to the station hardsuit list.
Added all of the xenoarch gear to the hazmat hardsuit for Zuh. Moves
some suit storage things around as they were lost somewhere along the
way since I committed them. Moves the Hazard Suit custom item over to
hardsuit code to prep for them being buildable on station at some point.
For now has the same stats as a voidsuit, no modules, just drains power
and has some extra pretty sprites. Sending this over to dev freeze
because most of it is required for hardsuits to be nice and pretty for
master. Now compatible with latest fixes.
2014-12-07 21:25:08 -05:00
Segrain
e0ab31756d Fix for double definition. 2014-12-08 04:01:00 +03:00
Segrain
aa575b446a Fix for #7260. 2014-12-08 03:57:02 +03:00
Ccomp5950
b4becaa587 Merge pull request #7264 from Zuhayr/master
Fixes, death refactor.
2014-12-07 19:38:21 -05:00