Ccomp5950
68f2833a3b
Merge pull request #6208 from comma/forcesay
...
Ported forcesay from TG
2014-08-29 22:43:20 -05:00
Ccomp5950
23386da708
Merge pull request #6207 from comma/catching
...
Ported catching things from TG
2014-08-29 22:42:04 -05:00
Chinsky
4ceb7dbd55
Merge pull request #6215 from PsiOmegaDelta/SyndiPDA
...
Syndicate Uplink - string to datum
2014-08-29 15:42:38 +04:00
Chinsky
54297a6865
Ported forcesay from TG
...
Stun batons and brute attacks have a chance to interrupt whatever guy was saying and send out incomplete version of whatever he had in chatbar.
Credit to Petethegoat.
2014-08-29 15:25:57 +04:00
PsiOmega
7e74ae82f5
Updates the Syndicate uplink to use a more robust datum system, rather than the old way of parsing a giant string.
2014-08-29 12:48:12 +02:00
Ccomp5950
83d61a9818
Merge pull request #6203 from PsiOmegaDelta/HUDs
...
Non-drone silicons now have access to a basic security xor medical hud.
2014-08-29 03:48:27 -05:00
Whitellama
b15c74acd0
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
2014-08-28 18:29:05 -07:00
Whitellama
aa0ab32a9c
Egg boxes and donut boxes can be constructed from cardboard
2014-08-28 18:27:51 -07:00
Chinsky
ca98cde944
Ported catching things from TG
...
If something hits human with throw intent on, he'll catch it instead of getting hit.
Uses speed var to determine if it's 2fast4catch.
credit to PeteTheGoat
2014-08-29 03:08:52 +04:00
PsiOmega
3b46636e0d
Non-drone silicons now have access to a basic security xor medical hud.
2014-08-28 20:01:43 +02:00
Chinsky
d962d7d7fe
Merge pull request #6193 from PsiOmegaDelta/StatusDisplayExam
...
Status display examination
2014-08-28 18:38:35 +04:00
Chinsky
fac6666b58
Merge pull request #6188 from Kelenius/OfWizardsAndOrbs
...
Adds a scrying orb for wizards
2014-08-28 14:44:07 +04:00
Zuhayr
25573c17c6
Merge pull request #6185 from comma/holodeck
...
Cleaned up holodeck controller a little.
2014-08-28 11:10:41 +09:30
Zuhayr
07da6e25f8
Merge pull request #6184 from comma/detfix
...
Fixed copypaste derp resulting in runtime when you are naked sans gloves...
2014-08-28 11:09:56 +09:30
Zuhayr
6c9f60349b
Merge pull request #6183 from comma/curtains
...
Added curatins.
2014-08-28 11:09:36 +09:30
Whitellama
bc47750801
Added trim to text inputs
2014-08-27 17:52:29 -07:00
Whitellama
c6ae920eda
Packages can now be labeled/titled with pens and have sprites to represent they've been labeled or tagged (with the destination tagger)
2014-08-27 13:06:20 -07:00
PsiOmega
2fa014d74b
Improves status display examination feedback. Ensures output is properly sanitized.
2014-08-27 14:16:33 +02:00
Zuhayr
ddf860fb13
Update preferences.dm
...
Fixing a merge error.
2014-08-27 20:56:05 +09:30
Zuhayr
cf68ad7c87
Master to dev merge.
2014-08-27 20:24:07 +09:30
Chinsky
ac6ffacec8
Merge pull request #6182 from PsiOmegaDelta/HoloAI
...
AI camera/holopad fix
2014-08-27 14:35:34 +04:00
Chinsky
3dfbaac368
Merge pull request #6181 from PsiOmegaDelta/SecMKII
...
Sec-hud MK II
2014-08-27 14:35:30 +04:00
Kelenius
7ceddc39fb
Adds a scrying orb for wizards
2014-08-27 10:09:56 +04:00
Chinsky
0d6b1aede7
Merge pull request #6170 from mwerezak/shuttle-fixes
...
Fixes shuttle ETA being given before arrive_time is set
2014-08-27 04:24:03 +04:00
Chinsky
eab2ef935b
Fixed copypaste derp resulting in runtime when you are naked sans gloves.
2014-08-27 03:41:11 +04:00
Chinsky
8b889774ee
Cleaned up holodeck controller a little.
...
Now it uses global list of holdeck programs available instead of hardcoding them into interface.
Console can be set to have only some of those programs.
2014-08-27 03:39:31 +04:00
Chinsky
2fe167c453
Added curatins.
...
Opaque non-dense structures.
2014-08-27 02:38:36 +04:00
Chinsky
50d7e98eb2
Merge pull request #6175 from mwerezak/master-fixes
...
Fixes #6118
2014-08-27 01:33:39 +04:00
Chinsky
a893baf8be
Merge pull request #6167 from PsiOmegaDelta/PDATime
...
PDA - Examination now offers station time
2014-08-27 01:32:47 +04:00
PsiOmega
0090efb210
Fixes an issue where toggling camera lights would disconnect the AI from an active holopad while keeping the pad online.
2014-08-26 16:38:44 +02:00
PsiOmega
a1dd07db38
Merge remote-tracking branch 'upstream/dev' into StatusDisplay
...
conflicts:
maps/tgstation2.dmm
2014-08-26 14:21:29 +02:00
PsiOmega
ea549fb5ee
Making sec huds more fault tolerant. A number of sources never set id.rank, only id.assignment.
2014-08-26 13:44:49 +02:00
Chinsky
f40298715f
Merge pull request #6153 from PsiOmegaDelta/AtmosList
...
Central Atmospherics Computer - Air alarm sub-list
2014-08-26 15:25:59 +04:00
Chinsky
1c2cc138d6
Merge pull request #6168 from Kelenius/OfCablesAndStacks
...
Cables are now stacks
2014-08-26 15:25:31 +04:00
mwerezak
9859fc0b00
Fixes #6118
2014-08-25 21:02:57 -04:00
GinjaNinja32
778a0fc608
Removed debug statements
2014-08-26 01:43:54 +01:00
PsiOmega
a3b683d10f
Merge remote-tracking branch 'upstream/dev' into StatusDisplay. Moved code in New() into initialize().
2014-08-26 00:03:18 +02:00
PsiOmega
2786c8e8b9
Remote air alarm control for the isolation cells now available on the outpost.
2014-08-25 23:24:35 +02:00
PsiOmega
01be3a37c1
Merge remote-tracking branch 'upstream/dev' into AtmosList. Atmospherics Control Console no longer sorts the machines list, as this is now done elsewhere.
2014-08-25 21:53:17 +02:00
Chinsky
b05f9a16ac
Merge pull request #6155 from LightningIron/master
...
Changes some messages to make more sense
2014-08-25 22:18:49 +04:00
Chinsky
e2607e51f0
Merge pull request #6161 from PsiOmegaDelta/RoundEnd
...
Extended round end feedback
2014-08-25 22:18:11 +04:00
Chinsky
286f22e15c
Merge pull request #6160 from PsiOmegaDelta/DecaSeconds
...
Increased mecha area-denial feedback interval
2014-08-25 22:17:37 +04:00
Chinsky
e12f3bd92b
Merge pull request #6159 from PsiOmegaDelta/MachineSort
...
Optimization of machinery sort?
2014-08-25 22:12:43 +04:00
Chinsky
124217fab9
Merge pull request #6134 from PsiOmegaDelta/Construction
...
Fixes #6130
2014-08-25 22:12:28 +04:00
PsiOmega
9eef5ff877
Status displays can now show station time. Also prepares for making brig timer inherit from status display.
2014-08-25 19:30:56 +02:00
Kelenius
a1348faa8c
Cables are now stacks
2014-08-25 18:54:35 +04:00
PsiOmega
4ffe5f411b
Absolut cleanup.
2014-08-25 16:52:47 +02:00
PsiOmega
2c0bb7832d
Examining your own or a very close by PDA now reveals the current station time.
2014-08-25 12:34:25 +02:00
PsiOmega
3377ca1bfb
Based on https://github.com/tgstation/-tg-station/pull/4562 and adapted to BS12 shuttle code. Credit to @Ikarrus.
2014-08-25 07:37:59 +02:00
mwerezak
f1a1162c3f
Fixes shuttle ETA given before arrive_time is set
2014-08-24 22:43:19 -04:00
