Mloc
66cb91d281
Merge pull request #7280 from Neerti/12_7_14_holopad_and_emotes
...
Adds see_emote(), other cool things.
2014-12-18 22:10:54 +00:00
Amunak
d28cb57f79
Merges upstream/dev to ref, resolves merge conflicts
2014-12-18 03:44:28 +01:00
Amunak
4882074739
Code formatting, EOL at EOF fixes, refactoring
2014-12-18 03:11:49 +01:00
Amunak
edffbc680d
Fixed capitalization of most game items
2014-12-18 03:10:36 +01:00
PsiOmegaDelta
9a4dd0b6ea
Merge pull request #7473 from Hubblenaut/dev-freeze
...
Context-base Combat Cleanup and Fixes
2014-12-17 23:18:14 +01:00
Atlantiscze
77fa2705dd
Ion laws (including the "random" ones by admins) are now more visible for the AI/robots.
...
Because single line of text is so easy to miss in spammed chat. Now it automatically shows output of show-laws verb which is significantly harder to miss.
2014-12-17 07:43:46 +01:00
Hubblenaut
4065dcb7e2
Fixes, fixes, and more fixes
2014-12-16 14:51:46 +01:00
Hubblenaut
8120a9b77f
Makes kicks and stomps their own unarmed_attack types
2014-12-15 18:54:07 +01:00
Chinsky
7683086619
Merge pull request #7464 from Zuhayr/dev-freeze
...
Fixes (at least some) of the recursive power-drain crash issues.
2014-12-15 16:38:40 +03:00
PsiOmega
8aa5ee4d9a
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2014-12-15 08:58:28 +01:00
PsiOmega
f65ac4350f
Merge remote-tracking branch 'upstream/master' into dev-freeze
2014-12-15 08:56:11 +01:00
Hubblenaut
5fe9ca3df1
Species use a list for unarmed attack types
2014-12-14 22:48:14 +01:00
Zuhayr
29a3d34ff0
Fixes (at least some) of the recursive power-drain crash issues.
2014-12-14 14:44:53 +10:30
mwerezak
e01d056b75
Fixes #6240
2014-12-13 19:50:28 -05:00
mwerezak
bef305dff1
Fixes handle_organs() being called twice in Life()
2014-12-13 19:50:12 -05:00
PsiOmega
efb6adb452
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2014-12-14 00:27:16 +01:00
Chinsky
9536a92d60
Merge pull request #7442 from PsiOmegaDelta/CultGhost
...
Cult Ghost Manifestation
2014-12-13 17:06:10 +03:00
Zuhayr
a79886ec59
Added icons to species select window, changed Sol Common to blue.
2014-12-13 23:55:06 +10:30
Zuhayr
fbd4e46a3c
Added syllable sets for remaining languages.
2014-12-13 23:16:17 +10:30
Zuhayr
a704d1bf94
Merge branch 'languages' of https://github.com/Zuhayr/Baystation12 into dev
2014-12-13 23:13:40 +10:30
Zuhayr
d2803ec4d7
Merge resolution.
2014-12-13 23:10:46 +10:30
Zuhayr
0ce52b086a
Fixes #7371
2014-12-13 22:32:35 +10:30
Zuhayr
2569fdc1c2
Fixes #7437
2014-12-13 21:58:06 +10:30
Zuhayr
8c3d179e78
Merge pull request #7434 from PsiOmegaDelta/World
...
Removes world messages.
2014-12-13 19:42:28 +10:30
Zuhayr
cd096fd45b
Merge pull request #7385 from Zuhayr/dev-freeze
...
Reverts colours and catwalks.
2014-12-13 12:25:13 +10:30
PsiOmega
9c6adfe590
Cult Ghost Manifestation
...
Turns out ghosts could be pulled into reality in two places.
This ensures both use the same method.
2014-12-13 00:13:55 +01:00
PsiOmega
3eef1796d2
Removes world messages.
2014-12-12 19:49:30 +01:00
Zuhayr
f980a97b1d
Merge pull request #7424 from PsiOmegaDelta/Examinate
...
Allows observers to face what they examine/point at.
2014-12-13 05:11:34 +10:30
PsiOmega
4eb1eb5abc
Removes now redundant face_at checks, allows observers to face.
...
Was initially an attempt to fix lying mobs being unable to change facing to but https://github.com/Baystation12/Baystation12/blob/master/code/modules/mob/mob.dm#L764 complicates this.
2014-12-12 12:56:50 +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
PsiOmega
cf78fe903b
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2014-12-12 09:04:09 +01:00
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
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
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
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
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
Zuhayr
ed29f5ca2b
Added a more interesting/informative species selection window to chargen.
2014-12-11 03:49:28 +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
PsiOmega
52e6f96dc7
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2014-12-09 17:55:14 +01:00
Ccomp5950
cab064cd16
Merge pull request #7340 from Zuhayr/dev-freeze
...
Dev-freeze fixes.
2014-12-09 11:48:33 -05:00
