PsiOmegaDelta
901bfe7c66
Merge pull request #7348 from PsiOmegaDelta/dev
...
Dev
2014-12-09 17:56:37 +01:00
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
Zuhayr
72d36d67f3
Merge pull request #7336 from PsiOmegaDelta/GuessedItMapIssues
...
Map fixes.
2014-12-10 03:15:06 +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
f7a9731b01
Merge pull request #7342 from Amunak/blastfix
...
Blast doors' sprite now doesn't disappear when damaged
2014-12-10 03:10:55 +10:30
PsiOmegaDelta
41cca1b250
Merge pull request #7303 from TwistedAkai/dev
...
Implements existing assistant alternate job titles
2014-12-09 17:34:31 +01:00
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
PsiOmegaDelta
62b02025c1
Merge pull request #7339 from Segrain/master
...
Bugfixes.
2014-12-09 12:04:43 +01:00
Segrain
4fb83010e1
Fix for #7322 .
2014-12-09 14:55:25 +03:00
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
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
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
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
Loganbacca
2b98f70f9f
Science goggles overlay fix
2014-12-09 22:05:14 +13:00
PsiOmega
c6c7ee8729
Map fixes.
...
Removes lone pipe in the nuke arrival airlock.
A pipe for the new atmos ejection line had relocated itself into space. Returned to its place.
Adds airlocks mentioned in #7325 .
2014-12-09 09:57:24 +01:00
PsiOmegaDelta
1468b06f25
Merge pull request #7335 from PsiOmegaDelta/dev
...
Dev
2014-12-09 09:50:03 +01: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
PsiOmegaDelta
dfad0c966d
Merge pull request #7334 from PsiOmegaDelta/dev-freeze
...
Dev freeze
2014-12-09 09:11:45 +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
PsiOmegaDelta
c88cce1209
Merge pull request #7332 from Segrain/master
...
Bugfixes.
2014-12-09 08:51:04 +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
Zuhayr
a3ad4b6c5b
Merge pull request #7328 from mwerezak/dev-freeze-map
...
Fixes #7277 , map adjustments
2014-12-09 18:16:59 +10:30
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
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
mwerezak
e954f27116
Merge remote-tracking branch 'upstream/dev-freeze' into dev-freeze-map
2014-12-09 00:13:08 -05:00
Segrain
a311da90fb
Fix for #7330 .
2014-12-09 07:39:38 +03:00
Segrain
827a14ca69
Fix for #6649 .
2014-12-09 07:37:43 +03:00
Ccomp5950
cb0eca68ac
Merge pull request #7297 from Amunak/pipez
...
Engine remap, valves now show open/close state on examine.
2014-12-08 20:47:09 -05: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
d8fb78b711
Merge pull request #7326 from Raptor1628/dev-freeze
...
Hardsuit Fixes
2014-12-08 20:43:56 -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
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
mwerezak
3eec743a93
Fixes #7277 , map adjustments
...
Fixes #7277 , and includes some map changes and fixes from PR #7249 .
2014-12-08 20:31:34 -05:00
