Zuhayr
bb06b50177
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2013-08-09 13:21:54 -07:00
Segrain
907f9311ba
Vox flavor text.
2013-08-09 07:09:50 +03:00
Mloc-Argent
941f36ddec
Fix for autotraitor not working in secret probabilities. All modes default to 0 prob in secret now.
...
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2013-08-07 16:56:41 +01:00
Zuhayr
98bbb095ad
Swapped languages and datums over to global lists. Updated verbs.
2013-08-05 20:34:38 -07:00
comma
e45f429e4c
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12
...
Conflicts:
code/modules/mob/living/silicon/robot/robot.dm
maps/tgstation.2.1.0.0.1.dmm
2013-08-04 01:40:32 +04:00
Zuhayr
0f0ac218b3
Commented out blob and wish granter.
2013-08-03 12:51:41 -07:00
Zuhayr
27f7d1580d
Merge branch 'feature' of https://github.com/Zuhayr/Baystation12
2013-08-02 20:16:50 -07:00
Zuhayr
37f134ec42
Corruption fix - we had way too many strings somehow.
2013-08-02 20:14:20 -07:00
Zuhayr
b4e8c60472
Merge resolution.
2013-07-31 19:21:58 -07:00
Zuhayr
f50256eabb
Work progresses on species datums. Mass-commit due to repo issues requiring a reset.
2013-07-31 11:50:56 -07:00
Erthilo
89ffc92168
Fixes text errors in ghost manifest runes and newscasters with apostrophes.
2013-07-30 22:36:42 +01:00
Zuhayr
919dc1ae25
Added longer text to vox greeting message in Heist.
2013-07-29 06:39:43 -07:00
Zuhayr
8c3c26e2e8
Added cortical stacks for vox survival objective.
2013-07-29 06:36:55 -07:00
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
