Commit Graph

1239 Commits

Author SHA1 Message Date
Zuhayr
168e334abd Added BE_RAIDER pref to player setup and adjusted vox min player counts away from local testing values. 2013-07-28 06:05:22 -07:00
Zuhayr
0c88896adf Adds a vox heist game mode. Fairly complex. 2013-07-28 05:18:04 -07:00
Zuhayr
fdba632f88 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-07-27 01:12:27 -07:00
Zuhayr
c09d07bb82 Added tool steps to manually remove the bolts on a deployed nuclear weapon. 2013-07-27 00:09:19 -07:00
Zuhayr
6d8bd36d26 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-07-22 21:04:24 -07:00
Mloc-Argent
2123389f94 Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze 2013-07-22 14:42:31 +01:00
Mloc-Argent
c135d19b66 Partial fix for #2284.
Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-07-21 17:05:10 +01:00
Mloc-Argent
f29cd5946f Merge branch 'master' into bleeding-edge-freeze 2013-07-19 14:48:40 +01:00
Chinsky
67cc13751a Derp. 2013-07-11 02:09:01 +04:00
comma
47c6901df3 Fixes #3018
Should stop intercept report from trying to tell that wizards, ninjas and nuke operatives are trending to be crew members ( they are not ).
2013-07-11 01:30:16 +04:00
comma
722d4d27fb Fixed a typo. 2013-07-09 16:07:58 +04:00
comma
1095bd1978 Merge branch 'bleeding-edge-freeze' into viro 2013-07-09 12:49:23 +04:00
Segrain
c5a1a69b5b Stealth/invisibility tweaks. 2013-07-09 05:06:29 +03:00
Zuhayr
e9210b0701 Removed jobbanned and random pick drafting in understaffed modes, and implements voter-based forcedrafting. 2013-07-07 02:28:34 -07:00
Zuhayr
9a2ce35199 Commenting out ninja mode, as it is broken. 2013-07-06 21:53:11 -07:00
Mloc-Argent
08393161c0 Merge branch 'master' into BEF-staging
Conflicts:
	config/config.txt

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-07-04 13:08:28 +01:00
Mloc-Argent
cf4bd39f6e Updated the linkage between the NanoTrasen IRC bot and the server.
- Server will now send adminhelps to the admin channel, with information if there is no admins online.
- Server will inform the admin channel if the last admin online logs out.
- When a round ends, the server will alert the main channel, supplying some statistics.
Additionally, laid the groundwork for an external scripts system.
This is fully configurable/togglable in the config.txt file.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-07-02 23:41:40 +01:00
Spamcat
11e27c5999 Merge branch 'bleeding-edge-freeze' of github.com:Baystation12/Baystation12 into loops
Conflicts:
	code/game/gamemodes/objective.dm
2013-07-01 19:49:29 +04:00
Spamcat
10ee1fbcfe World loops 2: Electric Boogaloo. 2013-07-01 19:43:56 +04:00
comma
50f94ddd93 Merge branch 'bleeding-edge-freeze' into viro 2013-07-01 17:33:24 +04:00
Whitellama
99a317cf07 Removed debug outputs 2013-06-30 20:08:46 -07:00
Whitellama
f9b01a09cc Removed debug outputs and fixed double-forging of ninja objectives 2013-06-27 18:52:00 -07:00
Whitellama
ca74c8ab44 Raised required players of ninja gamemode (no longer 1, for debug) 2013-06-26 17:08:08 -07:00
Whitellama
90eaca1e53 WIP Ninja GM junk 2013-06-26 16:30:24 -07:00
Whitellama
bf953679c7 No more placeholder antags, and WIP space ninja gamemode stuff 2013-06-25 16:49:53 -07:00
Whitellama
41c8e8fe3f Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 2013-06-25 16:47:15 -07:00
Zuhayr
a877a2a9a8 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-06-25 23:55:01 -07:00
Whitellama
f3224bba2e Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 2013-06-24 21:48:33 -07:00
Zuhayr
12daf1f245 Merge pull request #3158 from Furlucis/master
Again with the changeling stab aiming
2013-06-24 20:45:25 -07:00
Zuhayr
2265e8e0b9 Fixes #2815 2013-06-24 21:55:21 -07:00
Furlucis
674269e315 Made changeling absorbing leave proper wounds and be aimable.
Signed-off-by: Furlucis <Logman115@gmail.com>
2013-06-24 17:35:55 -04:00
Whitellama
83ab2c430b Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze 2013-06-22 00:19:43 -07:00
Whitellama
424c9a0161 Space Ninja Gamemode Implementation 2013-06-22 00:19:32 -07:00
Spamcat
2b348eaa3e Phasing out world loops, pt 1 2013-06-20 17:21:16 +04:00
Chinsky
960a22ee43 Changes way viruses are stored in mobs.
Now it's an associative list:
uniqueID - virus datum

Updated most instances to match it.
2013-06-19 02:28:53 +04:00
Chinsky
cb7daa77a6 Merge branch 'bleeding-edge-freeze' into viro 2013-06-18 14:55:59 +04:00
Chinsky
de293c9fc5 Merge pull request #3086 from Mordeth221/patch-3
Ninja update, Several nerfs and tweaks
2013-06-18 01:40:28 -07:00
Mordeth221
a2c2c1fe62 Ninja update, Several nerfs and tweaks 2013-06-17 15:02:14 +01:00
Chinsky
fd13ff0d64 Merge branch 'vials' into viro 2013-06-16 11:22:15 +04:00
Whitellama
d23b758006 WIP: Implementing space ninja gamemode 2013-06-15 16:09:23 -07:00
meyar
4098cd9410 Fixes the player requirements, forgot to revert them from testing. 2013-06-12 20:52:49 -04:00
meyar
d965c23bd9 Removes the syndicate nuke agent last name system. 2013-06-12 20:46:59 -04:00
Zuhayr
38b44b2441 Items for wizard den, mental focus added to spellbook. 2013-06-10 14:56:47 -07:00
Chinsky
7a8a822a92 Made it possible for mob to be infected with several viruses at once. 2013-06-09 13:31:16 +04:00
Chinsky
e40140be03 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
Conflicts:
	html/changelog.html
	maps/tgstation.2.1.0.0.1.dmm
2013-06-08 05:55:42 +04:00
Ravensdale
c8f9864207 Fix: Engineering borg's 'Antique' sprite being invisible. Blasted caps.
New: Rowtree's 'Lucy' Cyborg and Serithi's 'REMNANT' AI Core sprites implemented.

Tweak: Cult's conversion rune failure text tweaked so something a little more immersive.
2013-06-03 13:32:44 -07:00
MisterBook
606a510168 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
Conflicts:
	html/changelog.html
2013-05-31 22:58:01 -05:00
Chinsky
4794fc4d1e Merge pull request #2933 from Furlucis/master
Fixes and tweaks for Obscure, Reveal and Seer runes, plus some amount of floundering around with git
2013-05-31 20:09:10 -07:00
Chinsky
de4f4e4788 Merge pull request #2927 from Baystation12/master
Merging master to BEF
2013-05-31 19:49:13 -07:00
Furlucis
0f9a1fe71c Fixes and a few tweaks to Obscure, Seer, and Reveal runes.
Signed-off-by: Furlucis <Logman115@gmail.com>
2013-05-31 19:42:27 -04:00