Chinsky
|
a76b87635e
|
It only holds 15 units.
|
2013-06-15 15:54:43 +04:00 |
|
Albert Iordache
|
8692d7f697
|
Merge pull request #3077 from comma/bleeding-edge-freeze
Added Local OOC verb.
|
2013-06-15 04:41:29 -07:00 |
|
Chinsky
|
71e47fcd1c
|
Added Local OOC verb.
Visible to those in view and all admins.
|
2013-06-15 15:36:55 +04:00 |
|
Chinsky
|
5ef5a17701
|
Merge pull request #3064 from Zuhayr/master
Projectile pinning, staggering, vox whitelist removal, vox raider spawn verb.
|
2013-06-15 00:21:24 -07:00 |
|
Zuhayr
|
5c15ce687c
|
SHUT UP SPAMCAT. Bow fix, vox raider message fix.
|
2013-06-15 14:18:40 -07:00 |
|
Zuhayr
|
b41b1fc2f3
|
Armalis simple_animal/sprite.
|
2013-06-15 04:09:49 -07:00 |
|
Zuhayr
|
b1cac56e9a
|
Merge resolution.
|
2013-06-15 03:54:22 -07:00 |
|
Chinsky
|
183474b637
|
Merge pull request #3073 from misterbook/bleeding-edge-freeze
Monkey Taser Fix
|
2013-06-15 00:18:21 -07:00 |
|
Zuhayr
|
04be69a0b4
|
Magboots and gloves for vox, removed a debug string, tweaked vox.
|
2013-06-14 20:07:16 -07:00 |
|
Zuhayr
|
d0e99a9d58
|
Merge branch 'master' of https://github.com/Baystation12/Baystation12
|
2013-06-14 20:05:40 -07:00 |
|
MisterBook
|
4ea1e16863
|
With a brand new spanking BEF pull.
|
2013-06-14 21:24:28 -05:00 |
|
MisterBook
|
092b2c6e6e
|
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
|
2013-06-14 21:07:50 -05:00 |
|
Jim "Apples
|
9b4841143e
|
Merge pull request #3067 from NicholasDV/enhancementsAndFeatures
Adds in the Kida
|
2013-06-14 21:06:37 -05:00 |
|
Zuhayr
|
e3acd6e728
|
Minor tweak to previous commit.
|
2013-06-14 16:38:36 -07:00 |
|
Zuhayr
|
1e1426fa8a
|
Minor vox sprite fix, added vox to Create Admin verb.
|
2013-06-14 16:36:55 -07:00 |
|
Zuhayr
|
52433df154
|
Runtime fix (argh) and removal of vox from the station race whitelist.
|
2013-06-14 13:41:06 -07:00 |
|
Zuhayr
|
030290d3a7
|
Learn to test compile when using new procs, idiot.
|
2013-06-14 13:25:20 -07:00 |
|
Zuhayr
|
73d35bcd4f
|
Minor changes/sanity checks in yank-out verb.
|
2013-06-14 13:17:21 -07:00 |
|
Zuhayr
|
7a19d6165b
|
Projectile shrapnel tweak for ease of forensics identification.
|
2013-06-14 13:03:03 -07:00 |
|
Zuhayr
|
084b1414c3
|
Bloody footprint resprites.
|
2013-06-14 12:42:25 -07:00 |
|
Zuhayr
|
753129086e
|
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12
|
2013-06-14 12:01:56 -07:00 |
|
Jim "Apples"
|
6d1d50ed69
|
Merge pull request #3067 from NicholasDV/enhancementsAndFeatures
Adds in the Kida
|
2013-06-14 10:33:23 -07:00 |
|
Chinsky
|
d0eaeb89b9
|
Merge pull request #3070 from Baystation12/master
Updating BEF with master
|
2013-06-14 03:17:39 -07:00 |
|
Chinsky
|
a246caad63
|
Fixes unticked file.
No idea why some files get randomly unticked.
|
2013-06-14 14:17:12 +04:00 |
|
Chinsky
|
8aa377a09a
|
Merge pull request #2920 from Jamini/bleeding-edge-freeze
BEF - Farwa - Alien Monkies
|
2013-06-14 03:13:05 -07:00 |
|
Chinsky
|
5993ce4be5
|
Merge pull request #3068 from SkyMarshal/airfixes
Fixes a runtime involving ZAS zones lose their air datum. (I have no fucking idea why that happens)
|
2013-06-14 02:59:29 -07:00 |
|
Jamini
|
89766706fe
|
Alien Monkeys - Farwa, Stok, Aenera
Signed-off-by: Jamini <mobiousjami@gmail.com>
|
2013-06-14 02:22:27 -04:00 |
|
Zuhayr
|
b30b156950
|
Melee embedding fix.
|
2013-06-13 22:59:13 -07:00 |
|
Zuhayr
|
3cb36272cb
|
Adjusted yank verb to apply to others as well as yourself.
|
2013-06-13 22:18:26 -07:00 |
|
NicholasDV
|
9139a70d8c
|
Adds in the icon files for Kidan and fixes issue
SkyMarshal caught a small issue, and I realized that I never did
include the kidan icon files. This is the fix!
|
2013-06-14 00:06:45 -04:00 |
|
Zuhayr
|
13a3537f46
|
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12
|
2013-06-13 20:48:47 -07:00 |
|
Zuhayr
|
6b73b8ec2f
|
Adjusted kitchen knives. Added projectile pinning. Various tweaks.
|
2013-06-13 20:46:09 -07:00 |
|
SkyMarshal
|
1f886448b6
|
Fixes a runtime involving ZAS zones lose their air datum. (I have no fucking idea why that happens)
Fixes #3059
|
2013-06-13 18:20:42 -07:00 |
|
Zuhayr
|
1b230504f5
|
Runtime fix.
|
2013-06-13 15:57:41 -07:00 |
|
Zuhayr
|
4aa577bef3
|
Powered crossbows, sprites, ammo.
|
2013-06-13 15:31:47 -07:00 |
|
Zuhayr
|
13b4f0def9
|
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12
|
2013-06-13 15:31:03 -07:00 |
|
NicholasDV
|
a2fddc0fc1
|
Adds in the Kida
Adds in the Kida Race to all parts.
|
2013-06-13 18:22:05 -04:00 |
|
Zuhayr
|
4928f56030
|
Merge branch 'master' of https://github.com/Baystation12/Baystation12
|
2013-06-13 12:03:58 -07:00 |
|
Kilakk
|
ccd7bd6dae
|
Changelog again
|
2013-06-13 13:02:39 -04:00 |
|
Chinsky
|
f4fc9b40e8
|
Merge pull request #3065 from Asanadas/bleeding-edge-freeze
Added Malsquando's colored suit to the hop's wardrobe locker.
|
2013-06-13 07:23:51 -07:00 |
|
Asanadas
|
7479fd272c
|
Added Malsquando's colored suit to the hop's wardrobe locker.
Everything should be working correctly.
|
2013-06-13 09:41:52 -04:00 |
|
Chinsky
|
152ddfd646
|
Merge pull request #3063 from Zuhayr/master
Throwing weapon runtime fix.
|
2013-06-12 23:04:40 -07:00 |
|
Chinsky
|
3642f1829a
|
Merge pull request #3062 from Zuhayr/master
Crossbow, bolts, rods.
|
2013-06-12 22:42:32 -07:00 |
|
Kilakk
|
7df34d817f
|
Updating the changelog
|
2013-06-13 00:09:20 -04:00 |
|
Kilakk
|
5660a551dc
|
Changed research outpost doors to access_xenoarch
* Most (if not all) doors on the research outpost now require access to
"Xenoarchaeology" ("65" for mappers)
|
2013-06-12 23:55:15 -04:00 |
|
Kilakk
|
c98fe26816
|
Adds access_xenoarch "Xenoarchaeology"
* Tested this, it works with the ID computer and with scientists on
spawn-in
* Scientists hold on to their access to xenoarch for now
|
2013-06-12 23:52:41 -04:00 |
|
Chinsky
|
88b96bb5fe
|
Merge pull request #3060 from meyar/bleeding-edge-freeze
Fixes an ERT mapping error
|
2013-06-12 20:00:46 -07:00 |
|
meyar
|
e0513769ae
|
Fixes an ERT mapping error
|
2013-06-12 22:56:54 -04:00 |
|
Chinsky
|
7c29fb3a71
|
Merge pull request #3058 from meyar/bleeding-edge-freeze
Forgot some medkits for the syndiscum
|
2013-06-12 19:00:01 -07:00 |
|
meyar
|
a4c94ab9db
|
Forgot some medkits for the syndiscum
|
2013-06-12 21:56:36 -04:00 |
|