cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-12 19:22:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
19,552 Commits 9 Branches 0 Tags
68dc63e005f801bf5a2cb10b8c89ddcd1323d219
Commit Graph

7759 Commits

Author SHA1 Message Date
Ccomp5950
9952f47677 Merge branch 'engineering-substations' of https://github.com/atlantiscze/Baystation12 into atlantiscze-engineering-substations 2014-08-30 21:57:48 -05:00
Zuhayr
677470c24c Merge pull request #6216 from PsiOmegaDelta/ShowerCurtains 
Shower curtains
 2014-08-31 00:12:02 +09:30
Ccomp5950
f6b2fbd32d Merge pull request #6210 from comma/nochatter 
Sending PDA messages and talking in radio things now triggers autoaim.
 2014-08-29 22:44:04 -05:00
Ccomp5950
48f7f08d64 Merge pull request #6209 from comma/ironscan 
Health analyzer now shows is limb is not meat.
 2014-08-29 22:43:37 -05:00
Ccomp5950
68f2833a3b Merge pull request #6208 from comma/forcesay 
Ported forcesay from TG
 2014-08-29 22:43:20 -05:00
Atlantiscze
87cc0e509c Adds Substation related areas 
- Adds areas for Substations
- Adds mapping icon for Substations.
 2014-08-29 20:55:28 +02: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
PsiOmega
ed28212d22 Adding shower curtains to the various station showers because.. well, it's nice. 2014-08-29 11:08:22 +02: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
552d4ed6eb Health analyzer now shows is limb is not meat. 2014-08-29 04:13:12 +04:00
Chinsky
4cc2bd4e3d Sending PDA messages and talking in radio things now triggers autoaim. 
With PDA messages it also gives visible message, for baddies without autoaim-capable guns to consider.
 2014-08-29 04:12:14 +04: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
6c9f60349b Merge pull request #6183 from comma/curtains 
Added curatins.
 2014-08-28 11:09:36 +09:30
PsiOmega
2fa014d74b Improves status display examination feedback. Ensures output is properly sanitized. 2014-08-27 14:16:33 +02:00
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
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
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
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
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
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
PsiOmega
3367fdf8bb Now mecha area denial feedback is closer to 5 seconds apart then ever. 2014-08-24 23:41:15 +02:00
PsiOmega
1084a1d6d7 Optimization of machinery sort? 2014-08-24 22:52:51 +02:00
Chinsky
23576ffdb6 Merge pull request #6154 from PsiOmegaDelta/Traitor 
Code phrase/response no longer randomly assigned
 2014-08-24 23:12:19 +04:00
Chinsky
63dc3424f0 Merge pull request #6142 from PsiOmegaDelta/sec_hud 
Sec-huds can now handle alt-titles.
 2014-08-24 21:45:34 +04:00
Chinsky
7d18ddfab1 Merge pull request #6146 from PsiOmegaDelta/Dylovene 
Renames anti-toxin bottles to dylovene.
 2014-08-24 21:45:00 +04:00
Ccomp5950
3104b0421e Merge pull request #6141 from PsiOmegaDelta/Radio 
Department radio use on join
 2014-08-24 12:44:12 -05:00
Ccomp5950
6e8722de53 Merge pull request #6120 from PsiOmegaDelta/Sanity 
Can again create newfeeds
 2014-08-24 12:30:53 -05:00