Zuhayr
f09d1218fe
Master to dev merge.
2014-08-11 17:23:40 +09:30
Zuhayr
a2945a00d7
Merge pull request #5940 from mwerezak/power-net
...
Update for shield generator power use and power net fixes
2014-08-11 10:13:26 +09:30
Zuhayr
7c46a67551
Merge pull request #5949 from Ccomp5950/cult-tele
...
Summon cultist and free cultists runes now give cultists less damage
2014-08-11 10:13:12 +09:30
Zuhayr
9ec66acc90
Merge pull request #5936 from Walter0o/patch-3
...
fixes #5934 and teleport comp fix
2014-08-11 10:12:57 +09:30
Ccomp5950
a44a9b2d61
Merge pull request #5942 from Jarcolr/customs
...
Fixes 2 broken custom items, adds 1 new one and removes duplicate icon_state file
2014-08-10 18:54:36 -05:00
Ccomp5950
ceeb389a55
Merge pull request #5948 from mwerezak/train
...
Fixes runtime in train/explode()
2014-08-10 18:53:27 -05:00
Ccomp5950
06da9e8070
Merge pull request #5941 from Whitellama/master
...
Fixes #5577 , Dionaea crashing on death. Fixes #5838 , tomes not being able to be stored on bookshelves."
2014-08-10 18:53:11 -05:00
Ccomp5950
756b220bf3
Summon cultist and free cultists runes now give cultists less damage
...
Damage scales downward with each additional cultists around the rune.
No more automatic 15 damage for freedom then 25 for summoning even if you have 8 cultists helping with the ritual.
2014-08-10 18:26:58 -05:00
mwerezak
8482314541
Fixes runtime in train/explode()
2014-08-10 18:37:39 -04:00
Chinsky
3b9ac30de5
Merge pull request #5933 from Walter0o/patch-2
...
meter improvements
2014-08-11 01:57:29 +04:00
Chinsky
06aa6ab798
Merge pull request #5937 from Walter0o/patch-4
...
capsaicin and condensedcapsaicin changes
2014-08-11 01:57:24 +04:00
Chinsky
7df146ba2a
Merge pull request #5924 from mwerezak/train
...
Fixes #5915
2014-08-11 01:57:02 +04:00
mwerezak
03e557823c
Fixed #5912
...
Also fixes hydroponics trays not updating
2014-08-10 16:29:09 -04:00
Whitellama
c87ad570f8
Cult tomes can't be destroyed with ethanol
2014-08-10 12:50:53 -07:00
mwerezak
58e0b659d4
Reorganizes shieldgen source code and icon files
2014-08-10 11:58:25 -04:00
Chinsky
3d3ef4bf58
Merge pull request #5931 from Mloc/bs12-power
...
XGM optimizations and fixes
2014-08-10 18:08:50 +04:00
Whitellama
49c8c6f2cb
Made arcane tomes a subtype of books, fixes #5838
2014-08-10 02:23:36 -07:00
Jarcolr
2db24a17d5
Typo
2014-08-10 11:57:40 +03:00
Jarcolr
4666966dab
Fixes 2 broken custom items, adds 1 new one
...
Fixes hazard hardsuit icon_state, paper icon_state missing for an item,
removed krinn_hatt from obj/clothing/hats.dmi since it's defined to be
in custom_items.dmi and added MiT labcoat
2014-08-10 11:49:14 +03:00
Whitellama
cfa1ff3440
Fixed Dionaea crashing on death
2014-08-10 01:00:26 -07:00
mwerezak
444d03a335
Fixes #5901
2014-08-10 04:00:20 -04:00
mwerezak
e1dc7d436b
Fixes icons and other things not updating when the master controller updates power status.
...
This was due to the master controller using update_powered_status()
instead of power_change(), but many machines override power_change() to
do various things when the machine gains or loses power.
2014-08-10 03:45:20 -04:00
mwerezak
4b070a2de6
Fixes #5935
...
Also improves apc/process() (doesnt add and then remove charge from
cells when it doesn't have to).
2014-08-10 03:44:56 -04:00
Walter0o
29ce255597
feedback change on meter improvements
...
thanks @comma
2014-08-10 06:47:28 +02:00
mwerezak
3be94d47c1
Updates renwick shield generator
2014-08-10 00:42:25 -04:00
mwerezak
213b11601e
Updates emitters and containment field power usage
...
As well as PA power usage. It's not used at the moment, but it might be
used by downstream or in the future.
2014-08-10 00:40:58 -04:00
mwerezak
a08204fc16
Updates emergency and wall shield power usage
2014-08-10 00:39:57 -04:00
Walter0o
e7c4f09aad
capsaicin and condensedcapsaicin changes
...
turns them into pain dealing reagents instead of burndamage dealing
2014-08-10 02:47:24 +02:00
Walter0o
fa15a25b67
fixes #5934
2014-08-10 02:17:06 +02:00
Walter0o
852cccf94a
fixes tele-comp not checking power on initialize()
...
prevents exploiting the computer back on while area power is off
2014-08-10 02:07:13 +02:00
Chinsky
18070da974
Merge pull request #5922 from Jarcolr/customs
...
Complements the job specific satchels with 5 new job specific backpacks
2014-08-10 04:02:26 +04:00
Chinsky
749bd6d3f2
Merge pull request #5920 from Jarcolr/patch-1
...
Move through blenders and pull blenders places
2014-08-10 04:00:11 +04:00
Walter0o
aea4dc3344
meter improvements
...
- can unwrench meters now without needing to unwrench the pipe beneath
- AIs and ghosts can still click to examine
- other mobs don't read meter instead of doing whatever it is they are clicking for, e.g. shooting a gun
- 3 tile range check for non-AI/ghost still in place
- added feedback when no power or broken
2014-08-09 21:46:44 +02:00
Mloc-Argent
674343ce18
XGM optimizations and fixes
...
fixes ZAS unsim connections filling up
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2014-08-09 19:49:08 +01:00
Ccomp5950
882d505824
Merge pull request #5917 from mwerezak/fix
...
Some fixes
2014-08-08 20:45:27 -05:00
mwerezak
30c96bc7cc
Fixes #5915
...
Also allows checking remaining engine charge by examining, and removes
the verb.
2014-08-08 20:31:14 -04:00
Jarcolr
b4e9d9923f
Complements the satchels with backpacks
...
5 new backpacks: virologist, chemistry, geneticist, science,
hydroponics.
2014-08-08 22:20:11 +03:00
Jarcolr
a3cbbe4d0b
Move through and pull blender
...
Changed density and anchored to 0.
2014-08-08 20:39:35 +03:00
PsiOmega
00fcfa7899
Makes it possible to setup pAI configuration from the character setup screen.
2014-08-08 13:31:52 +02:00
PsiOmega
8568a6aa89
Explicit proc/Topic definitions.
2014-08-08 13:21:51 +02:00
Chinsky
9f9865dac4
Merge pull request #5619 from mwerezak/power-net
...
ATMOSPHERICS and Power Net Overhaul
2014-08-08 09:49:42 +04:00
mwerezak
47b32122d4
Updates disposal bin pressurization
...
Also tweaks flasher power use.
2014-08-07 19:31:17 -04:00
Walter0o
4c6349f585
fixes #5914
...
user message blatantly stolen from /tg/ <3
2014-08-07 23:41:11 +02:00
mwerezak
a6c31bc5e8
Fixes xbow tension not being rest when fired
2014-08-07 17:06:01 -04:00
mwerezak
170e03d736
Fixes yank out object bloodying the wrong hands
2014-08-07 16:49:44 -04:00
mwerezak
7f89f891b6
Fixes icon not reverting when cycling a suit back
2014-08-07 16:30:21 -04:00
Chinsky
6e4c42766e
Merge pull request #5908 from mwerezak/fix
...
Fixes bad entry in rig/sprite_sheets_obj
2014-08-07 20:24:30 +04:00
Zuhayr
1384a93b59
Merge pull request #5904 from MrSnapwalk/icanseeeverything
...
Adds toggleable goggles.
2014-08-07 10:02:34 +09:30
Zuhayr
aa90ebb0c6
Merge pull request #5903 from Ccomp5950/mouse-trap-tag-fix
...
Fixed the font tag on mouse traps description.
2014-08-07 10:01:23 +09:30
mwerezak
d4c06d0424
Fixes bad entry in rig/sprite_sheets_obj
2014-08-06 14:36:20 -04:00
