comma
05142eac35
Fixed formatting issue.
...
Editing name and description works now.
2013-07-01 15:14:30 +04:00
Zuhayr
0a5363515a
Merge pull request #3221 from Baystation12/bleeding-edge-freeze
...
Bleeding edge freeze
2013-07-01 03:00:03 -07:00
Chinsky
2a10d6e5e1
Merge pull request #3220 from Zuhayr/feature
...
Fixes/more items.
2013-07-01 02:57:20 -07:00
Zuhayr
f228d77e3b
Merge pull request #3219 from fauxki/bleeding-edge-freeze
...
BEF - Map Edit - Prison wing.
2013-07-01 01:41:10 -07:00
Zuhayr
4a31613309
Merge pull request #3177 from Whitellama/bleeding-edge-freeze
...
Space Ninja Gamemode Implementation
2013-07-01 01:31:04 -07:00
fauxtada
1e59da289f
BEF - Map Edit
...
- Adds supplies to the permabrig so prisoners can eat without using their ID.
2013-06-30 21:34:39 -07:00
Whitellama
99a317cf07
Removed debug outputs
2013-06-30 20:08:46 -07:00
Whitellama
6d8654eb7a
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
...
Conflicts:
html/changelog.html
2013-06-30 20:02:36 -07:00
Jim "Apples"
5dac22883c
Merge pull request #3218 from Zuhayr/feature
...
More custom items.
2013-06-30 16:36:45 -07:00
Jim "Apples"
186fe98973
Merge pull request #3217 from Zuhayr/feature
...
Custom items.
2013-06-30 15:56:07 -07:00
Whitellama
e49a80d822
Fixed changelog conflicts
2013-06-30 13:59:24 -07:00
Chinsky
59f4717096
Merge pull request #3211 from misterbook/bleeding-edge-freeze
...
Pulling the teeth from bees, lowering halloss regen
2013-06-30 10:04:29 -07:00
Chinsky
aecad80fb1
Merge pull request #3216 from meyar/bleeding-edge-freeze
...
Fixes a few ERT mapping errors
2013-06-30 10:01:43 -07:00
Chinsky
04e4318304
Merge pull request #3206 from Zuhayr/feature
...
Cyborg cleanup, fix.
2013-06-30 10:01:16 -07:00
Zuhayr
19680cb2ba
Compile fix.
2013-06-30 05:15:33 -07:00
meyar
e29b078dbb
Fixes a few ERT mapping errors
...
Fixes a few more broken door sprites (Srsly, dafuq)
2013-06-30 08:10:56 -04:00
Chinsky
3ce810daad
Merge pull request #3214 from Vetinarix/bleeding-edge-freeze
...
Medical Tweaks
2013-06-29 23:42:37 -07:00
Zuhayr
b33e91fbb1
Cleaned up a lot of the module selection code, added Combat module.
2013-06-29 22:14:43 -07:00
Vetinari
c9e61feadb
Medical Tweaks
2013-06-30 14:37:38 +10:00
Zuhayr
bd864f6dc0
Fixes #3204
2013-06-29 21:12:41 -07:00
MisterBook
2661f8e8ea
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
2013-06-29 23:06:39 -05:00
MisterBook
b9fb3538b1
Pulled the teeth out of bees. Less damage, will not attack you unless they are pissed off (And then, only when the target of their rage has disappeared). Will no longer murder you from seven tiles away. Bio defenses lowered - having only a helmet means they can't get to 30% of your body. Only a suit means they can't get to 70% of your body. Full coverage? Full protection. All spacesuits have bio armor, so covers pressure sealed suits too.
...
Turned down halloss regen. Added flashing pain and an owie message when you get shot by tasers. Feel that agony.
2013-06-29 23:05:06 -05:00
Zuhayr
c10137a118
Fixes #3184
2013-06-29 19:08:41 -07:00
Zuhayr
5b5dcb8480
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12
2013-06-29 18:11:39 -07:00
Zuhayr
6fc787ff73
Fixes #3201
2013-06-29 18:09:35 -07:00
Zuhayr
e87348dd8d
Quickfix for #3194
2013-06-29 17:56:38 -07:00
Zuhayr
60eeccd2ed
Fixes #3198
2013-06-29 17:27:46 -07:00
Zuhayr
3192323c19
Fixes #3200
2013-06-29 16:57:08 -07:00
Zuhayr
729b01f193
Merge pull request #3208 from zekesulastin/language-whitelist
...
Allow for selection of one secondary language based on alienwhitelist.txt
2013-06-29 14:45:51 -07:00
Zuhayr
3c79ef20dd
Merge pull request #3207 from jack-fractal/bleeding-edge-freeze
...
Bodybag -> Cryobag (tiny re-factoring)
2013-06-29 14:43:35 -07:00
ZekeSulastin
a928f4d5ec
New players spawn with selected secondary language
...
As with the setup, this checks in alienwhitelist.txt for entries of
the form ckey - Language_Species, with Soghun for Unathi.
2013-06-29 17:33:44 -04:00
ZekeSulastin
3c6c9ed304
Secondary language is saved in the char saves
...
Also increments the max save version; previous saves are rendered
compatible via sanity check assuming no secondary language.
2013-06-29 17:32:48 -04:00
ZekeSulastin
9a8b9bcc60
Added secondary language to char setup
...
This allows for one secondary language to be selected per character.
Whitelisting is done in alienwhitelist.txt via ckey; language options
are specified by ckey - Language_Species, with Soghun for Unathi as with
the normal whitelist.
2013-06-29 17:31:21 -04:00
jack-fractal
00db60fa95
This submission modifies the bodybag.dm file to prevent the parent class (bodybag) from having to know about it's child class (cryobag).
...
This also removes redundant defines from cryobag class.
2013-06-29 16:49:48 -04:00
Chinsky
0e1829794e
Started on editing capability for virus DB.
...
Some weird issues with it, like first <a> making stuff invisible.
Committing before Armageddon.
2013-06-29 19:08:31 +04:00
Chinsky
ce0d3ea68f
Merge pull request #3205 from Zuhayr/feature
...
Fixes #3184
2013-06-29 02:17:01 -07:00
Chinsky
60b33af71f
Merge pull request #3203 from Zuhayr/feature
...
Bugs.
2013-06-29 01:17:53 -07:00
Zuhayr
681f34a8c6
Merge pull request #3202 from meyar/bleeding-edge-freeze
...
Fixes a few shutters. Root cause unknown.
2013-06-29 00:16:45 -07:00
meyar
d6e19335e6
Fixes a few shutters. Root cause unknown.
2013-06-29 03:05:50 -04:00
Zuhayr
9b9cf6dfe0
Merge pull request #3190 from Kilakk/bleeding-edge-freeze
...
Fixes #3188 - Mods can now see deadchat
2013-06-28 23:06:26 -07:00
Zuhayr
aae0769cc7
Merge pull request #3196 from Vetinarix/bleeding-edge-freeze
...
Medbay Tweaks
2013-06-28 23:05:51 -07:00
Vetinari
df93d2eac0
Medbay Tweaks
...
Edits to Chem, Virology and Reception. Replaced some lights, added some
more windows about the Medbay, reticulated splines.
2013-06-29 14:37:01 +10:00
Chinsky
8bd7d77916
Medical record viral DB now should list scanned virus2 stamms.
...
Fixed runtime in analyzer DB uploading.
Fixed derp in get_info() proc for viri
2013-06-28 23:57:16 +04:00
Chinsky
051edc2227
Started implementing of ViroDB.
...
-Analyzers now add info about viruses they scan to global list.
-Health analyzers will only find known viruses.
2013-06-28 15:43:58 +04:00
Mloc-Argent
00e4e01e0c
Merge branch 'bleeding-edge-freeze' of github.com:Baystation12/Baystation12 into bef
2013-06-28 11:37:39 +01:00
Mloc-Argent
f868a30ef8
Merge branch 'BEF-staging' of github.com:Baystation12/Baystation12 into staging
2013-06-28 11:36:43 +01:00
Chinsky
11937b6b8c
Merge pull request #3192 from Zuhayr/feature
...
Whitellama's changelog merge.
2013-06-28 00:12:38 -07:00
Zuhayr
fa1a95b514
I hate the changelog.
2013-06-28 17:05:18 -07:00
Whitellama
e052ef5a22
Whitellama's changelog merge.
2013-06-28 17:02:29 -07:00
Zuhayr
7a7000a041
Merge pull request #3186 from meyar/bleeding-edge-freeze
...
Re-adds the barman shotgun permit Fixes a security maintenance area issue.
2013-06-27 23:50:33 -07:00
