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
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
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
Segrain
4fb83010e1
Fix for #7322 .
2014-12-09 14:55:25 +03:00
Zuhayr
79fbc2cde9
Fixes autolathe menu.
2014-12-09 21:32:40 +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
Loganbacca
9fce8921ac
Tape fixes
...
- All paper variants now have taped icon states (might change this to an overlay in future)
- Tape objects inherit overlays from attached papers
2014-12-09 22:53:49 +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
239eb2a0e8
Fixes #7323 .
...
pAIs no longer check and cut wires when interacting with radio functionality.
2014-12-09 09:10:49 +01:00
PsiOmega
924955a4c8
Merge remote-tracking branch 'upstream/master' into dev-freeze
2014-12-09 09:07:38 +01:00
Zuhayr
6a8aa48cac
Merge pull request #7309 from PsiOmegaDelta/DiscoIsDead
...
Fixes #7308 .
2014-12-09 18:18:21 +10:30
Zuhayr
b44321775e
Merge pull request #7276 from mwerezak/poster
...
Poster fixes
2014-12-09 18:17:46 +10:30
PsiOmegaDelta
f9e59d430b
Merge pull request #7329 from mwerezak/talisman
...
Adds image for cult talismans
2014-12-09 07:26:10 +01:00
mwerezak
ab89ce59dc
Merge remote-tracking branch 'upstream/dev-freeze' into poster
...
Conflicts:
code/game/objects/effects/decals/contraband.dm
2014-12-09 00:17:22 -05:00
Segrain
a311da90fb
Fix for #7330 .
2014-12-09 07:39:38 +03:00
Ccomp5950
6ade2b46a0
Merge pull request #7282 from mwerezak/tape-roll
...
Adds tape rolls to the tool storage spawner list
2014-12-08 20:46:58 -05:00
mwerezak
81890c968e
Adds image for cult talismans
...
So they aren't blank when examined.
2014-12-08 20:45:15 -05:00
Ccomp5950
0b56714123
Merge pull request #7321 from GinjaNinja32/cryothing
...
Cryo computer is now walkable.
2014-12-08 20:43:38 -05:00
Ccomp5950
4d615fc294
Merge pull request #7271 from Segrain/dev-freeze
...
Dev-freeze fixes.
2014-12-08 20:40:02 -05:00
GinjaNinja32
362af29cbc
Fixes #7320
2014-12-08 20:11:07 +00:00
GinjaNinja32
eb2a62c11b
Fix virologists spawning without jumpsuits, IDs or PDAs. Fixes #7312 .
2014-12-08 18:48:14 +00:00
PsiOmega
887e2c3abf
Fixes #7308 .
...
Adds missing parent call in Del().
2014-12-08 18:20:39 +01:00
PsiOmega
445dba869d
Merge branch 'dev-freeze' into dev
2014-12-08 17:38:13 +01:00
PsiOmega
4d6d74b859
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/machinery/portable_turret.dm
2014-12-08 17:37:42 +01:00
PsiOmega
87998f7eb1
Fixes #7295 .
...
Cleans up round end summary.
Removes duplication of traitor summaries.
Attempts to improve how the traitor purchase log is presented.
Ghosts made manifest now have different names and assignments, otherwise one would get messages like "Anguished Phantom played as an Anguished Phantom".
Instead the message is "Anguished Phantom played as a Manifest Ghost".
2014-12-08 17:06:36 +01:00
Zuhayr
a2d3a0055e
Fixes #7301
2014-12-09 02:35:46 +10:30
GinjaNinja32
681a6d21ea
Merge remote-tracking branch 'upstream/dev' into !
...
Conflicts:
code/modules/mob/hear_say.dm
2014-12-08 15:32:49 +00:00
Mloc
83f2a5ba5a
fix some misplaced set_dir()s
...
fixes part of #7284
fixes #7288
fixes one of #7287
Signed-off-by: Mloc <colmohici@gmail.com >
2014-12-08 10:09:09 +00:00
Segrain
7f1b5f0603
Fix for #7285 .
2014-12-08 11:20:46 +03:00
mwerezak
d506eca89a
Adds tape rolls to the tool storage spawner list
2014-12-08 00:15:27 -05:00
mwerezak
f9564cbe5e
Poster fixes
...
Fixes #7261
Fixes placed posters being visible on both sides of the wall.
Fixes the poster_type var used to specify certain poster designs on the
map not working correctly, and makes the nuke op shuttle poster an
actual poster.
Poster placement now belongs to the poster object instead of turf/simulated/
Posters can now be placed on unsimulated and shuttle walls.
2014-12-07 22:30:08 -05:00
Zuhayr
371bdb10d9
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev-freeze
2014-12-08 13:03:20 +10:30
Zuhayr
3c66bd3920
Merge resolution.
2014-12-08 13:01:04 +10:30
Segrain
639c61721b
Fix for #7261 .
2014-12-08 03:58:42 +03:00
Ccomp5950
b4becaa587
Merge pull request #7264 from Zuhayr/master
...
Fixes, death refactor.
2014-12-07 19:38:21 -05:00
Zuhayr
b556609e27
Replaces some macros.
2014-12-08 10:34:36 +10:30
PsiOmegaDelta
5b6d3ab55a
Merge pull request #7263 from mwerezak/hydrotray
...
Fixes atoms with no flags set being walkable
2014-12-07 22:06:10 +01:00
PsiOmegaDelta
3ddb6eed96
Merge pull request #7222 from mwerezak/holospace
...
Holodeck
2014-12-07 22:05:49 +01:00
PsiOmegaDelta
79cd5f6430
Merge pull request #7251 from Loganbacca/implantfix
...
Implant fixes/cleanup
2014-12-07 22:05:14 +01:00
Zuhayr
dfca49c900
Fixes #7105
2014-12-08 05:14:04 +10:30
Zuhayr
1211360118
Fixes #6974
2014-12-08 05:00:54 +10:30
Zuhayr
17a8c59ff9
Fixes #7151
2014-12-08 04:37:07 +10:30
Zuhayr
7ff46d64fb
Fixes #7162 . Eject ID verb for laptops is still busted though.
2014-12-08 04:22:56 +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
