Mloc-Argent
3d2cc3cd82
Revert "Merge pull request #4985 from jack-fractal/dev"
...
This reverts commit 1679b4062fb149b273d9colmohici@gmail.com >
Conflicts:
code/datums/visibility_networks/update_triggers.dm
2014-05-31 00:25:56 +01:00
Mloc-Argent
ee2e68960a
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
Conflicts:
code/game/machinery/cloning.dm
code/modules/admin/admin_verbs.dm
2014-05-31 00:17:56 +01:00
Ccomp5950
fd78c58f46
Bot down? Let's not lock up the entire server.
...
Instead we'll spawn a thread to handle it, not like we care what is returned either way.
2014-05-29 21:36:34 -05:00
Zuhayr
045168ba17
Merge pull request #5082 from mwerezak/inaprovaline
...
Inaprovaline no longer a substitute for breathing
2014-05-29 11:19:18 +09:30
mwerezak
47a7617edd
Inaprovaline no longer a substitute for breathing
2014-05-28 11:27:21 -04:00
Zuhayr
8f50fbcd3b
Fixes #4940
2014-05-28 17:00:31 +09:30
Zuhayr
c2b97b7fcb
Fixes #4643
2014-05-28 16:41:54 +09:30
mwerezak
fbaa84c509
More sensible oxyloss scaling
2014-05-27 02:41:12 -04:00
mwerezak
694f0706bb
Fixes inhale_pp ratio
...
The amount of inhaled gas used shouldn't approach infinity as inhale_pp
goes to zero, should it?
Also the amount of gas used should decrease with inhale_pp as the
oxyloss is being caused by the fact that fewer moles are entering the
bloodstream.
2014-05-27 02:39:32 -04:00
mwerezak
7c7df8b4e2
Fixes #5018
2014-05-26 17:16:58 -04:00
Zuhayr
dcbe9ce061
Merge pull request #5048 from Hubblenaut/dev-freeze
...
Paper bundle fixes and other general game improvements
2014-05-26 23:18:27 +09:30
Zuhayr
32935b4db9
Merge pull request #5055 from mwerezak/disease2-verb
...
Fixes #4889
2014-05-26 16:53:00 +09:30
Zuhayr
1313034133
Merge pull request #5044 from mwerezak/consoles
...
Console fixes
2014-05-25 22:09:47 +09:30
Ccomp5950
ff0d667337
Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze
2014-05-24 19:02:16 -05:00
mwerezak
d5b22e9125
Forgot to add VV menu entry for give_disease2
2014-05-24 12:14:16 -04:00
mwerezak
2c3ecc78d5
Fixes #4889
2014-05-24 11:54:55 -04:00
mwerezak
fa458a63ec
Fixes #5050
2014-05-24 11:00:46 -04:00
Hubblenaut
cd917e4125
Small bugfix for merging paper bundles
2014-05-24 02:27:38 +02:00
Hubblenaut
f602e10073
No longer toggling suit sensors when restrained.
2014-05-23 23:23:58 +02:00
Hubblenaut
4aff667d69
Spelling correction: It's called 'Accessory', not 'Accessoires'. Dang.
2014-05-23 23:23:25 +02:00
Hubblenaut
7e10d64252
Attack paper bundles with paper bundles
2014-05-23 22:50:34 +02:00
Hubblenaut
e28ce8a366
Removed all prefixes of type 'paper - '
2014-05-23 22:31:27 +02:00
Hubblenaut
041254ddc5
Fixes #5029
2014-05-23 22:23:02 +02:00
Hubblenaut
7b9518d4ce
Merge branch 'paperwork' into dev-freeze
2014-05-23 22:10:01 +02:00
Hubblenaut
52a9f0eb8e
Huge code cleanup and bugfixes, slight overlay modifications
2014-05-23 22:05:13 +02:00
Hubblenaut
5736200d18
Strip interface changes: Accessories, Pockets, Suit Sensors
2014-05-23 17:56:27 +02:00
mwerezak
296336e15e
Small fixes
2014-05-22 18:19:55 -04:00
mwerezak
637f7193fc
Fixes circuit var for other consoles
...
Also cleans up attackby while we're at it.
2014-05-22 18:05:57 -04:00
mwerezak
6308c2b7fe
Fixes wrong access on RD console
2014-05-22 17:36:46 -04:00
mwerezak
eb58fb1e0c
Fixes RD console circuit var not set.
...
Also removes redundant attackby code, and small change to text when
setting access protocol on the board.
Related to issue #5006
2014-05-22 17:36:01 -04:00
Hubblenaut
81b73357a6
Fixes typo in code
2014-05-20 00:28:54 +02:00
Hubblenaut
a5b306ea70
Copies tiny icon of photos accordingly
2014-05-20 00:02:31 +02:00
Hubblenaut
40c90a88d6
Removes name prefix of renamed photos
2014-05-19 23:41:53 +02:00
Hubblenaut
7eb6f83932
Removing name prefix of cabinet-generated paper
2014-05-19 23:38:54 +02:00
Zuhayr
56bdd108f9
Cleaned up holders a bit, added show_message() proc to them, added loops in custom_emote to show emotes to things in inventories with the right flag.
2014-05-18 10:59:47 +09:30
Zuhayr
e3f0bcd118
Adds PASSEMOTES flag to setup.dm, dionaea and borers.
2014-05-18 10:50:13 +09:30
Ccomp5950
7c1d8b32d0
Humanoid mobs won't default to having an undershirt.
2014-05-17 16:01:49 -05:00
Chinsky
99c6598fd1
Merge pull request #5012 from Zuhayr/dev
...
Derp.
2014-05-17 08:55:50 +04:00
Zuhayr
5585da89c6
Derp.
2014-05-17 14:20:53 +09:30
Zuhayr
1679b4062f
Merge pull request #4985 from jack-fractal/dev
...
Masks of Nar'sie - Testing Version
2014-05-17 14:01:00 +09:30
Chinsky
5b761f5207
Merge pull request #5011 from DJSnapshot/hotfix
...
Forgot I would need a null check.
2014-05-17 08:29:16 +04:00
DJSnapshot
56e3d0a37f
Forgot I would need a null check.
2014-05-16 21:26:08 -07:00
Zuhayr
7739e9954d
Fixed an oversight in held icon rendering for humans.
2014-05-17 13:50:08 +09:30
Zuhayr
8f97e9965b
Added leap and gut verbs to vox.
2014-05-17 13:49:45 +09:30
Zuhayr
911218067c
Added computer boards and gas tanks to the drone gripper (oversight).
2014-05-17 13:45:02 +09:30
Zuhayr
06883912e4
Commented out some debug lines.
2014-05-17 13:37:32 +09:30
Chinsky
91751cb56d
Merge pull request #5005 from Zuhayr/mobcache
...
Caching system for human icons, generalized breathing.
2014-05-17 07:57:54 +04:00
Chinsky
d51e048365
Merge pull request #5003 from Hubblenaut/dev
...
Paper bundle design and functionality update
2014-05-17 07:12:51 +04:00
Zuhayr
04315c1d43
Merge pull request #5001 from Intercross21/dev
...
More nice looking give spell/disease interface
2014-05-17 10:42:31 +09:30
Zuhayr
3aa1609ce6
Merge pull request #4998 from mwerezak/camera-alarm-cleanup
...
AI and cyborg alarm code cleanup
2014-05-17 10:38:16 +09:30
