ebfa0a0fd2
Merge branch 'pr/2'
...
Conflicts:
baystation12.dme
config/example/dbconfig.txt
2013-08-17 15:22:49 -04:00
9c58348879
Holodeck exploit fix.
2013-08-17 04:41:28 -07:00
033b0450a0
Engineering merge.
2013-08-14 20:00:38 -07:00
c19d136996
Podman fix.
2013-08-14 19:58:39 -07:00
b8dc7cc939
Merge pull request #3505 from Zuhayr/master
...
Language cleanup/mouse speech fix.
2013-08-13 16:48:45 -07:00
e10a433800
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2013-08-14 01:01:18 -07:00
623a2978b7
Merge branch 'dev-freeze' of https://github.com/Baystation12/Baystation12
2013-08-14 01:01:09 -07:00
1bdb1b6694
Merge pull request #3507 from Segrain/master
...
Internals for everyone.
2013-08-13 16:39:14 -07:00
cb20332de5
Added potential for chief engineer's locker to spawn with either a brown vest or webbing
2013-08-13 16:16:20 -07:00
2adc744e65
Merge pull request #1 from Baystation12/master
...
More patches from BS12:master
2013-08-13 13:39:15 -07:00
4e2ba5325a
Internals box fix.
2013-08-13 21:06:38 +03: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
2de41230c9
Merge remote-tracking branch 'upstream/master'
2013-08-13 13:41:24 +03:00
ccb87c446a
Vox beards.
2013-08-13 09:21:28 +03:00
86c66ebcd4
Possible fix to weird podman behavior.
2013-08-13 14:51:39 -07:00
254cef453a
Added a preferences switch for diona.
2013-08-13 14:16:07 -07:00
3a85e7afb2
Merge pull request #3495 from Zuhayr/master
...
Vox carryover fixes.
2013-08-12 07:03:55 -07: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
44aa77f7de
Adds a delay to the RCD when building.
2013-08-12 22:51:27 -07:00
5476ae192d
Attempting to reduce incidence of clickspam against mobs.
2013-08-12 22:44:57 -07:00
82eb19df9a
Merge pull request #3493 from Zuhayr/master
...
Click delay fixes (part 1)
2013-08-12 05:58:46 -07:00
9d1bbb16d0
Adds explosive implant admin messages, and jump button for explosions.
2013-08-12 12:34:13 +01:00
b3e184ad0a
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2013-08-12 00:10:12 -07:00
c00c377d76
Re-adding clown/mime
2013-08-12 02:04:08 -04:00
c1272238e7
Revert "Revert "Moving files around to make code changes more modular from base BS12""
...
This reverts commit 79ff9683496a1e94b2b7cfff09234606d668b5ee.
2013-08-12 02:04:07 -04:00
916256b400
Revert "Moving files around to make code changes more modular from base BS12"
...
This reverts commit f0473c4abd99e66fd9f4225567f23ae89e354e2c.
2013-08-12 02:04:07 -04:00
17d0a2232b
Moving files around to make code changes more modular from base BS12
2013-08-12 02:04:07 -04:00
e3213894bd
Items missing from map re-added.
2013-08-12 02:04:06 -04:00
375437a6cf
Changelog merge. I hate the changelog.
2013-08-12 11:20:41 -07:00
459aafd523
Fixed borg sprites no resetting with reset board.
2013-08-11 21:32:02 +01:00
166a7e57a6
Cult 'raise' rune how completely heals raised corpse.
2013-08-11 17:38:12 +01:00
070cb50f8d
PDAs can be used when buckled (and not in any other way restrained or stunned). Rejuvenate now completely heals a target or broken organs and viruses too.
2013-08-11 17:13:58 +01:00
672a810f44
New decorative object
...
So having gotten a (weak) grasp of Git and and creating objects, I'm
submitting my first commit. It's a simple potted plant decorative
object.
If there's something wrong, please let me know. I'm still quite new to
contributing to the game.
2013-08-11 02:49:02 -04:00
935a7f30ea
Typo fix.
2013-08-11 09:22:20 +03: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
4e5a17b94a
Lowered age for pod plants.
2013-08-10 00:20:09 -07: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
840468cb14
Fixed the order of update/return statements for dispenser.
2013-08-08 23:17:38 -07:00
23301d9b73
Made dispensers unwrenchable.
2013-08-08 22:56:31 -07:00
a3c4f43e82
Merge pull request #3459 from Mloc/probfix
...
Fix for autotraitor not working in secret probabilities.
2013-08-07 09:00:51 -07: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
f2fdbc6c83
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2013-08-07 21:30:45 -07:00
52b9242c4f
Compile fixes, blah.
2013-08-07 11:19:31 -07:00
0447a8e3e5
Adjusted monkeyizing/humanizing procs to use species properly.
2013-08-07 11:13:13 -07:00
221324d29b
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2013-08-07 00:25:53 -07:00
ZomgPonies