meyar
7a6a5f8386
Fixin' map shit.
2013-06-28 02:41:43 -04:00
meyar
c82226b627
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12
2013-06-28 02:31:45 -04:00
meyar
a458128d43
Revert
2013-06-28 02:31:10 -04:00
Chinsky
1d03732f40
Merge pull request #3180 from Zuhayr/feature
...
Hardsuit/medication nerf.
2013-06-27 23:00:12 -07:00
Zuhayr
1d28bb7cb3
Message tweaks.
2013-06-28 15:55:41 -07:00
Zuhayr
c7bbc3c9b3
Changelog.
2013-06-28 15:53:50 -07:00
Zuhayr
665bdd16ab
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12
2013-06-28 15:50:07 -07:00
Zuhayr
0f9384db8e
Merge pull request #3189 from Segrain/bleeding-edge-freeze
...
Examine() tweak.
2013-06-27 22:47:06 -07:00
Kilakk
6b5bd3ca8d
Fixes #3188 - Mods can now see deadchat
...
Mods can now see deadchat regardless of whether they're ghosted or not.
Works with the deadchat toggle.
2013-06-27 23:45:17 -04:00
Whitellama
f9b01a09cc
Removed debug outputs and fixed double-forging of ninja objectives
2013-06-27 18:52:00 -07:00
Zuhayr
58bf2d218c
Bandages and ointment cannot be used through space suits.
2013-06-27 18:02:10 -07:00
Zuhayr
f5abc3e041
Syringes now have an increased delay when injecting through a hardsuit.
2013-06-27 17:59:37 -07:00
Segrain
4bcae3a06b
Examine() update.
2013-06-28 03:33:06 +03:00
Chinsky
12a79e4ade
Merge pull request #3181 from Zuhayr/master
...
Fixes solar control and SMES for borgs.
2013-06-27 16:12:17 -07:00
Zuhayr
6f207a3a14
Fixes #2424
2013-06-27 18:09:48 -07:00
meyar
2409c67be6
Re-adds the barman shotgun permit
...
Fixes a security maintenance area issue.
2013-06-27 07:56:38 -04:00
Zuhayr
d28d90c1f0
Merge pull request #3185 from Vetinarix/bleeding-edge-freeze
...
Medbay Updates/Tweaks/Atmos Fixes
2013-06-27 04:04:17 -07:00
Zuhayr
5d912b70b2
Merge pull request #3183 from Segrain/master
...
ID cards bugfix.
2013-06-27 04:03:58 -07:00
Segrain
31e4487229
Fix for #2430 .
2013-06-27 14:10:05 +03:00
Vetinari
29930c8257
Psych Tweak
2013-06-27 20:22:11 +10:00
Vetinari
3a688f4ba7
More medical tweaks.
...
It ends here.
2013-06-27 20:17:49 +10:00
Vetinari
4af4970f92
Tweaks gonna tweak.
...
Moar.
2013-06-27 19:42:17 +10:00
Vetinari
b28f3b818f
Generic tweaks, Medbay
...
CMO Office, corridor alarms.
2013-06-27 19:32:11 +10:00
Vetinari
7e9fc3fd73
Medbay Cam Network
...
Adds camera for CMO observation of labs.
2013-06-27 19:09:30 +10:00
Vetinari
e15219d6f3
Medbay Atmos Fixes + Tweaks
...
More atmos fixes, inc. added more vents and scrubbers (so that isolated
areas do not over/de-pressurize) and other tid bits (intercoms, etc)
2013-06-27 18:58:05 +10:00
Chinsky
66bbebc378
Merge pull request #3178 from Jamini/bleeding-edge-freeze
...
Map tweaks
2013-06-26 23:43:13 -07:00
Chinsky
5414ceb7e7
Merge pull request #3179 from meyar/bleeding-edge-freeze
...
Bleeding edge freeze
2013-06-26 23:42:48 -07:00
Chinsky
4c2ab51b03
Merge pull request #3175 from Zuhayr/feature
...
Fixes from master, adds clotting to wounds.
2013-06-26 23:42:02 -07:00
Zuhayr
64dfca731b
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2013-06-27 09:01:01 -07:00
Zuhayr
d89950487a
Added a clot timer to wounds. If a wound is smaller than 30 damage, it will stop bleeding after <damage> seconds. More damage increases the counter.
2013-06-27 08:47:15 -07:00
Zuhayr
304be1fe41
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2013-06-27 07:27:38 -07:00
Zuhayr
5dbb0bcb87
Changelog.
2013-06-27 06:41:47 -07:00
meyar
cb7753f45f
Fixes a few issues
2013-06-27 02:12:32 -04:00
meyar
c1fe654d69
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12
2013-06-27 01:26:04 -04:00
Jamini
20bb582090
Map tweaks
...
Multiple bugfixes, adjustments to engineering, moved engineering pod, changed the training room to a portables storage room, changed the construction area to a training room, more bugfixes, fixed up a lot of pipes, fixed dozens of scrubbers/vents that were set off or set to the wrong type of vent, more fixes, fixed a crooked AI door, added a few airlocks that were lost with the medical change, more fixes, rearranged the engine room a bit, added a sing observation camera, more fixes.
Signed-off-by: Jamini <mobiousjami@gmail.com >
2013-06-26 21:09:16 -04:00
Whitellama
9ec3996cf4
Updated changelog with space ninja gamemode changes
2013-06-26 17:30:32 -07:00
Whitellama
ca74c8ab44
Raised required players of ninja gamemode (no longer 1, for debug)
2013-06-26 17:08:08 -07:00
Whitellama
90eaca1e53
WIP Ninja GM junk
2013-06-26 16:30:24 -07:00
Whitellama
7213e817f5
Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
2013-06-26 16:29:28 -07:00
Zuhayr
292929caa1
Merge pull request #3176 from Segrain/master
...
Rejuvenate bugfix.
2013-06-26 15:48:02 -07:00
Segrain
fa0e14652a
Revive bugfix.
2013-06-27 02:20:19 +03:00
Chinsky
31990dd0a7
Merge pull request #3173 from Zuhayr/master
...
Fixes meteor storm secret, fixes wall recharger sprites.
2013-06-26 14:24:54 -07:00
Zuhayr
6d46297757
Fixes #2947
2013-06-27 07:17:55 -07:00
Zuhayr
b41e92dc01
Fixes #2870
2013-06-27 07:01:42 -07:00
Zuhayr
8eec1d5379
Fixes #3008
2013-06-27 06:30:17 -07:00
Zuhayr
b270c6060d
Fixes #3025
2013-06-27 06:22:01 -07:00
Zuhayr
6d76698116
Organ regeneration nerf.
2013-06-27 02:33:57 -07:00
Zuhayr
333e59190c
Added minimum damage for cutting wounds to bleed visibly.
2013-06-27 02:09:36 -07:00
Chinsky
f1e3621ec6
Merge pull request #3171 from Zuhayr/master
...
Bleeding minimum-cutting-damage tweak, runtime fixes.
2013-06-26 13:29:43 -07:00
Zuhayr
c98671a824
Merge pull request #3170 from Vetinarix/bleeding-edge-freeze
...
Medbay Fixes for #3160 & Other
2013-06-26 06:00:05 -07:00
