cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2025-12-28 11:02:08 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,613 Commits 74 Branches 23 Tags
772da9b506313a5c5d797d451e136adfb489eb72
Commit Graph

1960 Commits

Author SHA1 Message Date
Tastyfish
772da9b506 made set-observe not make the mob pass out 2011-12-03 16:55:26 -05:00
Tastyfish
8c596e5c53 added sleeping on logout, willful sleeping, custom event message, slots 2011-12-02 17:28:24 -05:00
CompactNinja
79e8ad760b AI icon stuff from old code. Also fixed some of Mini's derping. 
Signed-off-by: CompactNinja <kulzernite@hotmail.com>
 2011-12-02 21:18:29 +10:30
CompactNinja
fa13653159 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2011-12-02 19:59:33 +10:30
CompactNinja
e2f4d44cbd Added old cyborg module sprites. Cyborgs can now select multiple styles, if there are multiple styles to select from. 
Signed-off-by: CompactNinja <kulzernite@hotmail.com>
 2011-12-02 19:59:11 +10:30
Miniature
e1a254c34f Fixed a silly, and no mode votes while round is in progress, more .gitignore (*.lk, info.json) 2011-12-02 15:47:42 +10:30
Tastyfish
fc5097929e Fixed 3+ character slots bug 2011-11-30 23:34:23 -05:00
headswe
e86db35be0 Merge pull request #50 from Tastyfish/master 
Nanotrasen laws, nobody likes you asimov
 2011-11-30 18:37:45 -08:00
Tastyfish
0b28c04e8c Nanotrasen laws, nobody likes you asimov 2011-11-30 19:23:37 -05:00
headswe
5cdbb88c03 Merge pull request #48 from Miniature/master 
Made security able to be traitors (AI and cyborg still can't)
 2011-11-30 16:07:01 -08:00
headswe
41346a6828 Merge pull request #49 from Tastyfish/master 
Added vending charges, removed clown/mime from main joblist, sec belts
 2011-11-30 16:06:38 -08:00
Tastyfish
b344e2a442 Merge remote-tracking branch 'upstream/master' 2011-11-30 18:35:58 -05:00
Tastyfish
26e1bfdaf1 Added vending charges, removed clown/mime from main joblist, sec belts fixed 2011-11-30 18:34:43 -05:00
Miniature
363b929216 Made security able to be traitors (AI and cyborg still can't) 2011-12-01 07:52:40 +10:30
Head
789dded1bf Merge branch 'master' of github.com:Baystation12/Baystation12 2011-11-30 17:51:03 +01:00
Head
73b9b7a481 Just a minor modification to the topic.dm 2011-11-30 17:49:35 +01:00
CompactNinja
13ab6b5e56 Crew manifest on join screen. 
Signed-off-by: CompactNinja <kulzernite@hotmail.com>
 2011-11-30 14:48:14 +10:30
headswe
098ec4138d Merge pull request #44 from Tastyfish/master 
Added multiple character slots! ie #31
 2011-11-29 16:45:06 -08:00
Tastyfish
1f9774b827 Merge remote-tracking branch 'upstream/master' 2011-11-29 19:33:29 -05:00
Tastyfish
719002dbee Added multiple character slots! 2011-11-29 19:32:07 -05:00
headswe
f426d9b5df Merge pull request #42 from Miniature/master 
Arrivals scanner
 2011-11-29 09:25:09 -08:00
Head
e1df14b5c1 Forgot to call makejson() 2011-11-29 18:15:49 +01:00
Miniature
15fa196907 AI Freelook 2011-11-30 01:31:22 +10:30
Miniature
1c01524055 Arrivals scanner stuff, now has sprite, new name, and uses power 
Just needs jobban stuff, then should be fine to add to a map
 2011-11-30 01:19:41 +10:30
Head
43d71282e0 Added back json support / restart notice 
should fix unnecessary restart after gamemode change before round start
 2011-11-29 15:45:01 +01:00
Miniature
d4ae76820b Fixedish the arrivals scanner, still need to add circuitboard to it 2011-11-29 22:57:57 +10:30
Miniature
fbf18ddd7e Arrivals scanner 2011-11-29 22:57:35 +10:30
Miniature
0e129ba6ce No more random end sounds 2011-11-29 22:50:29 +10:30
Albert Iordache
9179612571 Merge pull request #36 from Tastyfish/master 
Auto-flush disposals, auto-hush vending machines
 2011-11-29 02:14:31 -08:00
Tastyfish
26093c367e Merge remote-tracking branch 'upstream/master' 2011-11-29 02:51:52 -05:00
Tastyfish
e58dd6030f Auto-flush disposals, auto-hush vendending machines 2011-11-29 02:42:08 -05:00
CompactNinja
f003685c57 Commented out talking vending machines, as they are fucking annoying. 
Signed-off-by: CompactNinja <kulzernite@hotmail.com>
 2011-11-29 16:49:09 +10:30
CIB
2ac5d5aa94 Merge pull request #34 from Tastyfish/master 
changes company name, game-mode minimums
 2011-11-28 21:36:38 -08:00
Tastyfish
e89488975f we work for NanoTrasen! Also, we don't have enough people for your fancy 
15-person minimums
 2011-11-29 00:19:37 -05:00
CompactNinja
6df7528b16 Bunch o hair stuffs. 
Signed-off-by: CompactNinja <kulzernite@hotmail.com>
 2011-11-29 14:03:52 +10:30
Baystation12
74cc33fc02 Merge pull request #24 from CIB/master 
SMES' units have a lot more initial charge now, making life a bit easier for engineers
 2011-11-25 23:34:30 -08:00
cib
b00b9674b8 SMES units have a higher initial and maximum charge now. 2011-11-24 23:24:38 -08:00
Albert Iordache
4a4353e1fc Commented out some more forum-sql related code 2011-11-24 13:41:20 +02:00
Baystation12
c1cc954e94 Merge pull request #22 from Tastyfish/master 
Merged tg's and bay12's paper code, and closed a possible exploit.
 2011-11-24 03:21:07 -08:00
Tastyfish
cc14ed34a5 Merged best of tg's and bay12's paper code, and closed a possible exploit 2011-11-23 23:09:18 -05:00
Albert Iordache
34c84bbd6d Adding to #8. Edited README.txt, removed forum_activation.dm from the .dme, and added in the hub password 2011-11-21 20:44:57 +02:00
Albert Iordache
9440d9d296 Renamed tgstation.dme to baystation12.dme, added Bay12 admin list and moved a few admin verbs around from Game Master to Game Admin. 2011-11-21 20:01:13 +02:00
rockdtben
e7a0a44ea4 Implemented adjustToxLoss(amount) 
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2535 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-11-20 10:25:24 +02:00
petethegoat@gmail.com
fcddc199ff New chem dispenser interface, by Tobba. Some sanity checking in power.dm, by Tobba. 
Updated changelog, by PETE YEAAAH.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2532 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-11-20 10:24:17 +02:00
vageyenaman@gmail.com
8f734c9bc6 ◦ Toggling midis will now disable the current midi(s) playing. How fucking cool is that?? ◦ Fixed a bug for metroids: the AI loop was not canceling when a player was inserted into the mob. 
◦ A few icon additions for future updates, namely the terminals and plasmatoids.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2531 316c924e-a436-60f5-8080-3fe189b3f50e
 2011-11-20 10:21:34 +02:00
StrumpetPlaya
593e380133 Screen flashes red when hit by melee or projectiles. 2011-11-20 02:54:48 -05:00
StrumpetPlaya
1c580d1359 Speech Bubbles. 2011-11-20 01:23:55 -05:00
Baystation12
c80c66a0ae Merge pull request #12 from NivvyDaSkrl/master 
Fastler's changes: added ID requirements to mining processing/stacking consoles
 2011-11-19 02:58:27 -08:00
Albert Iordache
e72ec83af6 Merge branch 'master' of github.com:Baystation12/Baystation12 2011-11-19 10:51:02 +02:00
Albert Iordache
028014415f Merge branch 'master' of https://github.com/Abi79/tgstation13-git 
Conflicts:
	html/changelog.html
 2011-11-19 10:48:17 +02:00