Commit Graph

11588 Commits

Author SHA1 Message Date
cib
c5301c5144 Fixes issue #2296: Humans will not react to sleep toxins in smaller amounts than can be scrubbed. 2013-02-14 15:06:10 +01:00
cib
5217227f9a Fixes issue #2309: Infected blood now infects again. 2013-02-14 14:45:52 +01:00
Christian Bielert
e64297e162 Merge pull request #2321 from Gamerofthegame/master
Map update: Signs n Pipes
2013-02-14 03:36:29 -08:00
Gamerofthegame
3e2b43bce6 Grants security maint access again, Detective security access again, allows two roboticists to spawn at the start of the round instead of just one and removed chef's access to the morgue. Kept Hydro's, though, because they can plant-clone people and that makes sense. All tested, works out perfectly fine. 2013-02-14 00:46:57 -05:00
Gamerofthegame
11d9348d29 Changes medical doors; Storage general medical instead of surgery for chemistry, reception made a glass door so receptionists can see behind them. 2013-02-13 23:15:30 -05:00
Christian Bielert
6583e88f26 Merge pull request #2331 from Erthilo/master
Virus crate and emote fixes.
2013-02-13 10:59:51 -08:00
Erthilo
792b1f5af7 Another changelog update. 2013-02-13 18:01:49 +00:00
Erthilo
6d6787b89b Fixes newcaster censoring not censoring photos. 2013-02-13 18:01:14 +00:00
Erthilo
bda06da3c4 Changelog update. 2013-02-13 17:13:25 +00:00
Erthilo
ed76409141 Fixes mice emotes and Set-Pose verb periods. 2013-02-13 17:10:19 +00:00
Erthilo
7827680f66 Fixes virus crate having no model and cost. 2013-02-13 17:09:54 +00:00
Mloc
35eaa6b281 Merge pull request #2329 from Erthilo/master
Fixes SSD players not staying asleep.
2013-02-13 03:06:27 -08:00
Erthilo
dc6578563f Changelog update 2013-02-13 11:03:00 +00:00
Erthilo
e5fcb91fb0 Fixes SSD not being prolonged.
Signed-off-by: Erthilo <erthilo@gmail.com>
2013-02-13 10:35:09 +00:00
Gamerofthegame
2e184380d2 Lawyer map fix 2013-02-13 00:18:57 -05:00
Gamerofthegame
6829af32e2 Merge branch 'master' of https://github.com/Gamerofthegame/Baystation12 2013-02-12 20:54:47 -05:00
Gamerofthegame
97aa0a4f88 Map update, swaps Medical Red cross signs to the unironically sickly green kind. Also readds air-distro pipe connection to xenobiology and virology as I had added before, but was lost in a previous botched merger. 2013-02-12 20:54:07 -05:00
Gamerofthegame
794bbde661 Merge pull request #2 from Baystation12/master
Repo update
2013-02-12 13:26:45 -08:00
Christian Bielert
133d309f64 Merge pull request #2317 from RavingManiac/master
Allows mice to pass under tables
2013-02-12 10:01:31 -08:00
RavingManiac
8f1fd8390c revert baystation12.dme 2013-02-12 17:45:45 +08:00
RavingManiac
83d7031728 Revert "Traitor's revolver is now w_class=2.0 (pocketable). Sprite is now that of a snub-nosed revolver."
This reverts commit b600b54f61.
2013-02-12 17:43:28 +08:00
RavingManiac
4f8a8ed0cf Allows mice to pass over/under tables. 2013-02-12 17:35:15 +08:00
RavingManiac
d8269c0834 Merge branch 'master' of https://github.com/Baystation12/Baystation12
ow that of a snub-nosed revolver."

This reverts commit b600b54f61.
2013-02-12 02:53:23 +08:00
Chinsky
d23d56cb70 Merge pull request #2306 from CIB/master
Cleanly amputated limbs should not bleed.
2013-02-10 11:45:27 -08:00
cib
aa753a7f3c Cleanly amputated limbs should not bleed. 2013-02-10 20:43:32 +01:00
Cael Aislinn
db19400474 Merge pull request #2303 from Gamerofthegame/master
Map: Toxins update
2013-02-10 03:31:42 -08:00
Gamerofthegame
1476a8e2ef Minor Toxins change fixes 2013-02-10 06:08:38 -05:00
Gamerofthegame
e20b8da772 Merge branch 'master' of https://github.com/Gamerofthegame/Baystation12 2013-02-10 05:13:41 -05:00
Gamerofthegame
116b0d72b0 Toxin changes to meet Science whinings. 2013-02-10 05:11:23 -05:00
Gamerofthegame
99488dedab Merge pull request #1 from Baystation12/master
Repo updates
2013-02-10 02:10:42 -08:00
Cael Aislinn
fa38da51fc Merge pull request #2302 from comma/master
Hooonk, critical fix.
2013-02-09 20:01:30 -08:00
Chinsky
fb25d2f24a Fixed PACMAN causing infinite loops in power nets. 2013-02-10 07:59:12 +04:00
Chinsky
7a55a34a5c Okay, mapmerger don't fail me...
Changes to camera tags for renamed areas.
2013-02-10 00:01:07 +04:00
Chinsky
6b10b8a564 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-02-09 23:57:10 +04:00
Chinsky
2b7da59f1f Readded limb cutoff surgery. 2013-02-09 22:43:39 +04:00
Chinsky
7aa175b444 readded painkillers YET AGAIN 2013-02-09 22:10:50 +04:00
Chinsky
18932d79ac bad indentation on one of cocktails 2013-02-09 22:06:19 +04:00
Chinsky
6e7e9fb9b6 Merge pull request #2298 from CIB/master
Removes new event code and reinstates old event code
2013-02-09 09:44:13 -08:00
Chinsky
839500c8fb Fixed msay links. 2013-02-09 21:42:52 +04:00
cib
934eae1d15 Removes new event code and reinstates old event code. 2013-02-09 18:38:35 +01:00
Chinsky
1d97fa7547 Merge pull request #2295 from CIB/master
Fix virus event
2013-02-09 09:08:16 -08:00
cib
9fa8509569 Virus event is now again virus2. 2013-02-09 18:04:24 +01:00
cib
9e5cac7016 Merge branch 'master' of github.com:Baystation12/Baystation12 2013-02-09 17:57:11 +01:00
RavingManiac
b600b54f61 Traitor's revolver is now w_class=2.0 (pocketable). Sprite is now that of a snub-nosed revolver. 2013-02-09 20:24:29 +08:00
Chinsky
9190922b2d Merge pull request #2287 from Gamerofthegame/master
Map and RIG changes
2013-02-08 14:52:54 -08:00
Gamerofthegame
ead9a020bf I am tired of doing this 2013-02-08 17:46:05 -05:00
Hawk-v3
d72a32cc6c Merge pull request #2281 from comma/master
Samll fixes
2013-02-07 10:09:11 -08:00
Chinsky
1b3e14bc0c Merge branch 'master' of https://github.com/Baystation12/Baystation12 2013-02-07 21:54:22 +04:00
Chinsky
2221162315 Fixed issue with newscaster channels not working with ' in them. 2013-02-07 21:48:40 +04:00
Chinsky
61a7634c6f Fixed typo in AttoUrney's job. 2013-02-07 21:47:56 +04:00