Zuhayr
f09d1218fe
Master to dev merge.
2014-08-11 17:23:40 +09:30
Zuhayr
beaad5a37b
Merged in preferences file changes, changed None to Unset for home system.
2014-08-11 10:38:01 +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
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
03e557823c
Fixed #5912
...
Also fixes hydroponics trays not updating
2014-08-10 16:29:09 -04:00
mwerezak
58e0b659d4
Reorganizes shieldgen source code and icon files
2014-08-10 11:58:25 -04:00
Whitellama
49c8c6f2cb
Made arcane tomes a subtype of books, fixes #5838
2014-08-10 02:23:36 -07: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
a08204fc16
Updates emergency and wall shield power usage
2014-08-10 00:39:57 -04: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
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
Jarcolr
b4e9d9923f
Complements the satchels with backpacks
...
5 new backpacks: virologist, chemistry, geneticist, science,
hydroponics.
2014-08-08 22:20:11 +03: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
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
Ccomp5950
74fd47e2de
Fixed the font tag on mouse traps description.
2014-08-05 18:55:15 -05:00
mwerezak
018079beb5
Fixes gas mixture bugs, other bugs, and cleanup
...
In particular, gas_mixture/remove() was not accounting for
group_multiplier when determining the maximum amount of gas to remove
Also cleans up the interface for gas_mixture/heat_capacity().
2014-08-05 17:04:17 -04:00
Ccomp5950
52da372bac
Fueltanks now log and admin_msg when shot at / weldered
2014-08-04 21:11:09 -05:00
mwerezak
f50a24163b
Updates medical equipment power usage
...
Also adds a couple of cell chargers to engineering workshop and aux tool
storage.
2014-08-04 21:27:19 -04:00
mwerezak
949cdd275b
Updates portable pumps and scrubbers
2014-08-04 20:55:45 -04:00
Ccomp5950
ec3262a2a9
Merge pull request #5894 from atlantiscze/cyborg_module_icons
...
Cyborg component icons!
2014-08-04 19:38:57 -05:00
Ccomp5950
4df46548ac
Merge pull request #5896 from Glloyd/fixes
...
Two Fixes
2014-08-04 19:37:02 -05:00
Ccomp5950
f95074d17e
Merge pull request #5887 from mwerezak/jetpack-icon
...
Fixes #5852
2014-08-04 15:17:02 -05:00
Ccomp5950
a4fc1bfd6a
Merge pull request #5886 from mwerezak/stun-baton
...
Fixes some handcuff oversights
2014-08-04 15:15:52 -05:00
Graham Lloyd
2c30af6124
Fireaxe cabinet hacking now fails if player moves away
2014-08-04 14:53:33 -04:00
Graham Lloyd
029a3f3abd
fixes wall rechargers showing up as normal rechargers.
2014-08-04 14:52:51 -04:00
Atlantiscze
3627417c7b
- Adds cyborg module icons. Each component has it's own specific icon now. Two icons are animated, four static. Includes broken versions.
...
- AI radio icon (chat icon) updated to use icon from robot_component.dmi file - removed duplicity from radio.dmi
- Cyborg radio icon (chat icon) updated to look like the radio module.
2014-08-04 09:25:53 +02:00
mwerezak
8d04a83e97
Updates gas coolers, upgrading of coolers/heaters
2014-08-03 14:34:31 -04:00
mwerezak
cf3a37d732
Fixes #5852
2014-08-03 12:32:37 -04:00
mwerezak
cf9fe8de76
Fixes some handcuff oversights
...
You now don't need to be grabbing to put handcuffs on yourself, and you
can now put hancuffs on if your grab state is higher than aggressive.
2014-08-03 11:49:37 -04:00
Walter0o
a586c1dd70
remove double paper/attack() definition
2014-08-03 13:52:47 +02:00
mwerezak
cb2f68f81e
Merge remote-tracking branch 'upstream/dev' into power-net
2014-08-03 01:50:51 -04:00
Zuhayr
05a1de6bf4
Merge pull request #5880 from Whitellama/master
...
Fixes #5870 (glasses being named inconsistently) and unreported issue of wet rags making glass-hit noises when you wash down a window
2014-08-03 13:05:43 +09:30
Zuhayr
eae182725a
Merge pull request #5865 from mwerezak/shock-fix
...
Fixes siemens_coefficent not affecting shock damage
2014-08-03 13:04:52 +09:30
Zuhayr
f510c05865
Merge pull request #5862 from mwerezak/stun-baton
...
Stun Baton Nerf
2014-08-03 12:59:54 +09:30
Zuhayr
2619fb61ce
Merge pull request #5872 from PsiOmegaDelta/Manifest
...
Fixes #5867
2014-08-03 12:57:19 +09:30
mwerezak
3647fa4d7d
Adds gas mixing proc and updates gas mixer
...
Also includes a whole bunch of fixes and updates for atmos machinery
2014-08-02 18:35:57 -04:00
Mloc
e2ea86eab1
Merge pull request #5699 from Zuhayr/calamity
...
Calamity mode.
2014-08-02 11:39:29 +01:00
Whitellama
a36becad2b
Wet rag no longer makes noise or hits when wiping down windows (nor does anything with the NOBLUDGEON flag)
2014-08-01 17:05:54 -07:00
Zuhayr
9eed4422ff
Lowercasing some Del() calls.
2014-08-02 00:15:49 +09:30
Zuhayr
96c7012608
Fixed part of the ninja objective.
2014-08-01 23:54:38 +09:30
Zuhayr
0868c344cc
Adjustments and a typo fix.
2014-08-01 23:50:33 +09:30
Mloc
6133083ca6
Merge pull request #5858 from Zuhayr/master
...
Fixes
2014-08-01 15:02:23 +01:00
