3fbdc99079
Standardises logging. All attack logs now print in main logs. Added stripping and syringe logging. Added Jump commands to most attack logs.
2013-08-28 03:33:04 +01:00
91bc429721
Merge branch 'pr/4'
...
Conflicts:
.gitignore
2013-08-24 17:25:58 -04:00
e634cd01f2
Fixes #3517
2013-08-23 14:21:08 -04:00
b6d0fa7df3
More cult flavor text
2013-08-20 18:56:01 -04:00
a6e75de239
Rev Gamemode Fixes
2013-08-20 18:46:25 -04:00
cd4fe5affa
Malf AI action - Robot Factory
2013-08-19 19:27:47 -04:00
bbfe26bde8
Merge pull request #3503 from Mloc/master
...
Fully reverts clickdelay change.
2013-08-13 05:20:35 -07:00
71bdaa1698
Fully reverts clickdelay change.
...
It was immensely buggy with certain mobs, and server lag all but negated the benefits.
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2013-08-13 13:10:09 +01:00
ccb87c446a
Vox beards.
2013-08-13 09:21:28 +03:00
bed45dd864
Removes Vox flavour text carried over from chargen.
2013-08-13 00:03:14 -07:00
4874d5691b
Removes multicultural mrowling Vox from Heist.
2013-08-13 00:00:34 -07:00
5476ae192d
Attempting to reduce incidence of clickspam against mobs.
2013-08-12 22:44:57 -07:00
375437a6cf
Changelog merge. I hate the changelog.
2013-08-12 11:20:41 -07:00
166a7e57a6
Cult 'raise' rune how completely heals raised corpse.
2013-08-11 17:38:12 +01:00
a8c892a938
Fixes Heist check_antag verb.
2013-08-11 14:03:46 -07:00
9ee5d58ca6
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12
2013-08-10 12:24:33 -07:00
1d533de46a
Vox limbs.
2013-08-10 06:16:47 +03:00
bb06b50177
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2013-08-09 13:21:54 -07:00
907f9311ba
Vox flavor text.
2013-08-09 07:09:50 +03:00
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
98bbb095ad
Swapped languages and datums over to global lists. Updated verbs.
2013-08-05 20:34:38 -07:00
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
0f0ac218b3
Commented out blob and wish granter.
2013-08-03 12:51:41 -07:00
27f7d1580d
Merge branch 'feature' of https://github.com/Zuhayr/Baystation12
2013-08-02 20:16:50 -07:00
37f134ec42
Corruption fix - we had way too many strings somehow.
2013-08-02 20:14:20 -07:00
b4e8c60472
Merge resolution.
2013-07-31 19:21:58 -07:00
f50256eabb
Work progresses on species datums. Mass-commit due to repo issues requiring a reset.
2013-07-31 11:50:56 -07:00
89ffc92168
Fixes text errors in ghost manifest runes and newscasters with apostrophes.
2013-07-30 22:36:42 +01:00
919dc1ae25
Added longer text to vox greeting message in Heist.
2013-07-29 06:39:43 -07:00
8c3c26e2e8
Added cortical stacks for vox survival objective.
2013-07-29 06:36:55 -07:00
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
0c88896adf
Adds a vox heist game mode. Fairly complex.
2013-07-28 05:18:04 -07:00
fdba632f88
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2013-07-27 01:12:27 -07:00
c09d07bb82
Added tool steps to manually remove the bolts on a deployed nuclear weapon.
2013-07-27 00:09:19 -07:00
6d8bd36d26
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2013-07-22 21:04:24 -07:00
2123389f94
Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze
2013-07-22 14:42:31 +01:00
c135d19b66
Partial fix for #2284 .
...
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2013-07-21 17:05:10 +01:00
f29cd5946f
Merge branch 'master' into bleeding-edge-freeze
2013-07-19 14:48:40 +01:00
67cc13751a
Derp.
2013-07-11 02:09:01 +04:00
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
722d4d27fb
Fixed a typo.
2013-07-09 16:07:58 +04:00
1095bd1978
Merge branch 'bleeding-edge-freeze' into viro
2013-07-09 12:49:23 +04:00
c5a1a69b5b
Stealth/invisibility tweaks.
2013-07-09 05:06:29 +03:00
e9210b0701
Removed jobbanned and random pick drafting in understaffed modes, and implements voter-based forcedrafting.
2013-07-07 02:28:34 -07:00
9a2ce35199
Commenting out ninja mode, as it is broken.
2013-07-06 21:53:11 -07:00
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
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
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
10ee1fbcfe
World loops 2: Electric Boogaloo.
2013-07-01 19:43:56 +04:00
50f94ddd93
Merge branch 'bleeding-edge-freeze' into viro
2013-07-01 17:33:24 +04:00
Erthilo