Chinsky
cb7daa77a6
Merge branch 'bleeding-edge-freeze' into viro
2013-06-18 14:55:59 +04:00
Chinsky
2ab02faaa0
Merge pull request #3092 from fauxki/bleeding-edge-freeze
...
Medbay Map Fixes
2013-06-18 03:13:07 -07:00
fauxtada
32c16e6d19
Medbay Map Fixes
...
- Adjusts New Medbay based on commentary of BEF players.
- Reorganizes the surgery rest room.
- Puts in correct colorations to departments.
- Reorganizes Psychiatric's office and fixes their door.
- Hopefully fixed the disposal pipes.
- Moves delivery to next to morgue.
- A bunch of other shit I can't remember, tired.
Also, adds in training supplies to engineering training room, and moves starboard storage to the escape wing.
2013-06-18 03:07:09 -07: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
Chinsky
7df13adc8e
Merge pull request #3090 from Segrain/bleeding-edge-freeze
...
Airlock electronics and windoors.
2013-06-18 00:12:00 -07:00
Segrain
aa2ab80f6c
Missed a line.
2013-06-18 03:33:56 +03:00
Segrain
6f5cffa753
Better term.
2013-06-18 03:20:34 +03:00
Segrain
6c43ff47e9
Changelog update.
2013-06-18 03:05:37 +03:00
Segrain
beff70c014
Misclick fix.
2013-06-18 02:56:35 +03:00
Segrain
eec4606629
Adding removal of electronics out of broken/emagged windoors.
2013-06-18 02:51:53 +03:00
Segrain
dcf984577a
Adding construction of req_one_access doors.
2013-06-18 02:47:24 +03:00
Segrain
79d2d57859
Code cleanup.
2013-06-18 02:38:40 +03:00
Segrain
91e1e848f7
Bugfixes for windoor construction.
2013-06-18 02:34:15 +03:00
Mordeth221
a2c2c1fe62
Ninja update, Several nerfs and tweaks
2013-06-17 15:02:14 +01:00
Chinsky
fa45b7824a
Merge pull request #3083 from Kilakk/bleeding-edge-freeze
...
Adds a crew transfer notice for new players joining
2013-06-16 13:12:27 -07:00
Kilakk
13045af61a
Adds a crew transfer notice for new players
...
Adds the "The station is currently undergoing evacuation procedures"
notice for new people trying to join when there's a crew transfer going
on.
2013-06-16 12:38:38 -04:00
Kilakk
28152ccb0c
Merge remote-tracking branch 'upstream/bleeding-edge-freeze' into bleeding-edge-freeze
2013-06-16 12:10:54 -04:00
Chinsky
f89d1c050e
Merge pull request #3061 from Kilakk/bleeding-edge-freeze
...
Added access_xenoarch
2013-06-16 09:07:09 -07:00
Chinsky
e49d81a328
Merge pull request #3078 from Zuhayr/master
...
Some embedding fixes for unforeseen consequences, plus armalis.
2013-06-16 05:30:10 -07:00
Zuhayr
320643a52e
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12
2013-06-16 22:30:51 -07:00
Zuhayr
9e369ebf31
Apparently flick() is a thing, thanks Chinsky.
2013-06-16 22:30:30 -07:00
Zuhayr
0ebfa7439b
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12
2013-06-16 13:18:13 -07:00
Zuhayr
94c3c7ef49
Armalis additions, tweaks.
2013-06-16 13:17:20 -07:00
Zuhayr
2f8ef8f455
Minor detective scanner resprite/flashing addition.
2013-06-16 13:14:58 -07:00
Chinsky
44aa302341
Merge pull request #3080 from jack-fractal/bleeding-edge-freeze
...
Malsquando's cryobag reskin
2013-06-16 05:21:53 -07:00
Zuhayr
b7c260d6ea
Removed some debug strings.
2013-06-16 00:45:03 -07:00
Zuhayr
23299809f6
Armalis sprites, simple animal/mob yank-out verb and embedding.
2013-06-16 00:38:40 -07:00
Chinsky
898da9b310
Moved function of infecting blood samples with viruses to incubator from the cure machine.
2013-06-16 11:31:42 +04:00
Chinsky
6f45ff68c7
Changes to effects:
...
fixed indentation in some cases.
added feedback message to disorientation effect.
changed mucus virus transfer to proper proc
2013-06-16 11:30:47 +04:00
Chinsky
5aa1170bd3
Changed isolator to be able to isolate any virus from sample.
2013-06-16 11:29:18 +04:00
Chinsky
934a25a172
Added antigen check to viri comparing proc.
2013-06-16 11:27:00 +04:00
Chinsky
fd13ff0d64
Merge branch 'vials' into viro
2013-06-16 11:22:15 +04:00
Chinsky
ca4c3869b9
Merge branch 'bleeding-edge-freeze' into vials
2013-06-16 11:20:45 +04:00
Chinsky
f052d8d972
Added boxes for vials. Usual and secure version(default to viro access)
...
Changed vial lid sprite slightly.
2013-06-16 11:20:32 +04:00
jack-fractal
198fc21337
- adding Malsquando's cryobag reskin
2013-06-16 01:03:37 -04:00
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
