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
Zuhayr
fea8868753
Fixes #7310 and should also fix #7311
2014-12-10 02:28:03 +10:30
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
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
Neerti
4fcd9e6924
Resolves conflicts, I hope.
2014-12-08 20:46:55 -05:00
Ccomp5950
4d615fc294
Merge pull request #7271 from Segrain/dev-freeze
...
Dev-freeze fixes.
2014-12-08 20:40:02 -05:00
Neerti
e1babe281a
Fixes AI cards/mechs, with least bad method.
2014-12-08 20:14:55 -05:00
GinjaNinja32
439cbd6255
Properly merge stuff
2014-12-08 15:36:49 +00:00
GinjaNinja32
681a6d21ea
Merge remote-tracking branch 'upstream/dev' into !
...
Conflicts:
code/modules/mob/hear_say.dm
2014-12-08 15:32:49 +00:00
Neerti
9e9c297b2e
Begins work,
...
Holopads can receive and send emotes.
The AI, when using 'me', will check if a holopad is being used. If so, the holopad will output the emote. If not, it's outputted from the core.
The AI will hear emotes from near an active holopad.
There is a new obj verb called 'see_emote()', that works similarly to hear_talk().
custom_emote() modified to have 'seeing_obj' list. May be resource-intensive, not sure.
pAIs can now hear emotes, without issue.
Carded AIs can hear emotes, but they hear themselves twice.
Mechs do not hear emotes correctly at this time.
2014-12-07 23:03:42 -05:00
Zuhayr
3c66bd3920
Merge resolution.
2014-12-08 13:01:04 +10:30
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
GinjaNinja32
b6de85ec56
Fixes, better handling of things
2014-12-07 17:01:19 +00:00
Zuhayr
1176510fb2
Amendments to previous commit.
2014-12-08 03:29:03 +10:30
GinjaNinja32
17597af7fc
Better handling of language list, mobs no longer require noise-language in their list
2014-12-07 12:09:29 +00:00
GinjaNinja32
6a975a1e6a
Noise emotes
...
Conflicts:
code/modules/mob/living/carbon/brain/say.dm
2014-12-07 12:09:02 +00:00
Zuhayr
0fe2159f86
Fixes #7092
2014-12-07 21:21:00 +10:30
Zuhayr
e4a332c5b6
Fixes #7262
2014-12-07 21:20:24 +10:30
Zuhayr
a7ce13f49d
Fixes #7223 and #6966 , adds inhand and suit sprites for nymphs.
2014-12-07 20:44:11 +10:30
Zuhayr
958eb62ed5
Refactors a lot of reused/redundant death code, fixes #7224
2014-12-07 17:18:56 +10:30
Chinsky
60fcda13e7
Merge pull request #7241 from GinjaNinja32/slimefix
...
Fixes invisible slimes.
2014-12-06 04:23:43 +03:00
Chinsky
91cbd95838
Merge pull request #7237 from PsiOmegaDelta/PunchTheKeysForGodsSake
...
Fixes #7233 .
2014-12-06 04:23:31 +03:00
