ccomp5950
3ba1b18b8f
Most PDA's now are set to silent on news updates.
...
resolves #7454
Heads and Librarian(reporter) are not set to silent. The librarian can shush herself.
old bitty.
2014-12-22 21:44:26 -05:00
Zuhayr
056d2c1584
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze
2014-12-23 12:56:42 +10:30
Mloc-Argent
8800c33e50
fixes #7487
...
also fixes lag when building APCs in space.
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2014-12-22 15:41:07 +00:00
Zuhayr
32d799e53e
Line ending conflict resolution.
2014-12-22 23:27:06 +10:30
Mloc
5895615f72
Merge pull request #7377 from Amunak/ref
...
Research and circuit boards refactoring and improvements. Explosive can no longer be planted on webbing. Also some other stuff.
2014-12-18 22:29:35 +00:00
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
16c548b03f
Fixes explosives-on-webbing-prevention not working
2014-12-18 05:27:37 +01:00
Amunak
d28cb57f79
Merges upstream/dev to ref, resolves merge conflicts
2014-12-18 03:44:28 +01:00
Amunak
d20ccdb6b4
More name updates and refactoring for research
...
Also fixes compile errors
2014-12-18 03:26:55 +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
Amunak
1fcf11cdb5
You can no longer plant explosives on webbing.
2014-12-18 01:17:50 +01:00
Amunak
cc327cb671
Fixes typos in powercells.dm
2014-12-17 20:03:04 +01:00
Amunak
1a972974bc
Moves all circuitboards to their respective files.
...
Computer boards are now in /code/game/objects/items/weapons/circuitboards/computer/.
Buildable machinery boards are in /code/game/objects/items/weapons/circuitboards/machinery/.
Everything else is just in /code/game/objects/items/weapons/circuitboards/.
The circuitboard parent definition is in /code/game/objects/items/weapons/circuitboards/circuitboard.dm.
Did some minor renaming and capitalization fixes on the boards.
2014-12-17 14:31:21 +01:00
Zuhayr
2214837449
Comments out combi-tool, fixes infinite range combitool.
2014-12-16 18:23:21 +10:30
PsiOmega
8aa5ee4d9a
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2014-12-15 08:58:28 +01:00
Zuhayr
70abe4af0d
Merge pull request #7447 from mwerezak/manual-runtime
...
Alternative fix for manual runtimes
2014-12-14 13:06:16 +10:30
PsiOmega
efb6adb452
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2014-12-14 00:27:16 +01:00
mwerezak
168cabf03a
Fixes manual runtimes without modifying the construction of every object
...
Loads configuration before map creation instead.
This reverts commit 37b14bae39
2014-12-13 09:35:36 -05:00
Zuhayr
d2803ec4d7
Merge resolution.
2014-12-13 23:10:46 +10:30
Zuhayr
7efae862a2
Fixes #7290
2014-12-13 23:04:13 +10:30
Zuhayr
7770b355dd
Fixes #7404
2014-12-13 22:15:13 +10:30
Zuhayr
75d163705a
Merge pull request #7419 from PsiOmegaDelta/Books
...
Fixes manual runtimes, ensures initialize is called even after round start
2014-12-13 21:50:35 +10:30
Zuhayr
eafaef5cfa
Merge pull request #7422 from PsiOmegaDelta/MovableCorpses
...
Makes remains movable/cleanable.
2014-12-13 19:40:44 +10:30
PsiOmega
37b14bae39
Fixes manual runtimes, ensures initialize is called even after round start.
2014-12-12 20:07:53 +01:00
PsiOmega
b9ce5404d8
Fixes lab coat without icon.
...
Simply by changing it to the new labcoat variant that can be closed/opened.
Still created a proper definition for the old lab coat, /obj/item/clothing/suit/storage/labcoat, as it's inherited by custom gear.
2014-12-12 14:30:12 +01:00
PsiOmega
1047a75da4
Makes remains movable/cleanable.
...
It's now possible to move remains around.
Non-robotic remains can be poked to turn them into ashes. The ash can then be cleaned up.
2014-12-12 11:52:30 +01:00
PsiOmega
2e34cb79a5
Morphic Clerical Kit
...
Buy the morphic chameleon stamp (or Stmap) now and get a new pen which fakes signatures for free.
Attempts to improve the value of said chameleon stamp as it feels rather expensive for what it do.
2014-12-12 10:07:42 +01:00
PsiOmega
cf78fe903b
Merge remote-tracking branch 'upstream/dev-freeze' into dev
2014-12-12 09:04:09 +01:00
Zuhayr
3a475322e7
Merge pull request #7402 from PsiOmegaDelta/BrokenSpan
...
Fixes broken span statement.
2014-12-12 14:14:26 +10:30
Zuhayr
1ac3eef841
Merge pull request #7380 from PsiOmegaDelta/WikiUrl
...
Fixes #7378 .
2014-12-12 14:11:26 +10:30
PsiOmega
18ee756ca2
Fixes broken span statement.
...
Adds a proper class and closer.
2014-12-11 19:05:59 +01:00
PsiOmega
0cc7998197
Fixes #7378 .
...
Now uses the config.wikiurl setting instead.
Assumes wikiurl is in an format which can accept titles, in Bay12's case: http://wiki.baystation12.net/index.php?title=
2014-12-10 22:27:19 +01:00
PsiOmega
3a2aed265b
Fixes #7374 .
...
Now checks the correct ringer flag when receiving a PDA message.
2014-12-10 20:25:03 +01: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
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
Segrain
4fb83010e1
Fix for #7322 .
2014-12-09 14:55:25 +03:00
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
239eb2a0e8
Fixes #7323 .
...
pAIs no longer check and cut wires when interacting with radio functionality.
2014-12-09 09:10:49 +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
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
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
