Commit Graph

14067 Commits

Author SHA1 Message Date
Zuhayr
8b3631e6d5 Merge pull request #5972 from Walter0o/psu_fix
fixes #5964
2014-08-14 12:03:59 +09:30
Zuhayr
04bf4c7d90 Merge pull request #5981 from Walter0o/sound_removal
removes unused AI text2speech files and code
2014-08-14 12:02:10 +09:30
Chinsky
7187a8effd Merge pull request #5976 from atlantiscze/laptop-opening-fix
Fixes #5974
2014-08-14 06:31:27 +04:00
Chinsky
5a785ee866 Merge pull request #5973 from Walter0o/robot_fix
fixes #5970, prevents bugs in the future
2014-08-13 18:41:29 +04:00
Walter0o
94ec887a75 removes unused AI text2speech files and code,
saves about 4.5 MB traffic per client.
2014-08-13 11:24:23 +02:00
GinjaNinja32
b4e6b4e204 Fixes not checking proximity argument 2014-08-13 09:41:38 +01:00
Atlantiscze
40027d85bd Fixes #5974
- Fixes possible disappearance bug for Laptops
2014-08-13 08:19:46 +02:00
Walter0o
473a570b23 fixes #5970, prevents bugs in the future
this is not an issue at the moment but will become one should maxHealth ever get changed.
2014-08-13 03:43:30 +02:00
Walter0o
9421b4b48e fixes #5964 2014-08-13 03:38:41 +02:00
Chinsky
4657b7d923 Merge pull request #5959 from Walter0o/typo_fix
typo fix
2014-08-12 20:14:10 +04:00
Chinsky
064e55e9d0 Merge pull request #5963 from mwerezak/fixes
Fixes #5953
2014-08-12 19:22:48 +04:00
Zuhayr
78b1d4d473 Merge pull request #5960 from Ccomp5950/sci-age-limit
Added client age restrictions for science jobs.
2014-08-13 00:42:19 +09:30
Zuhayr
70c016814c Merge pull request #5955 from Walter0o/chem_reag_fix
fixes #5919 and some other reagent issues
2014-08-13 00:40:01 +09:30
mwerezak
c725ce0b7c airlock/arePowerSystemsOn() refactor
airlock/arePowerSystemsOn() now checks if the airlock has power in
addition to the wires being intact.
2014-08-12 10:46:54 -04:00
mwerezak
be330a1451 Fixes #5953 2014-08-12 00:34:31 -04:00
Walter0o
7aa7f1c56c getting rid of text macro 2014-08-12 02:24:37 +02:00
Ccomp5950
4ada8f2b98 Added client age restrictions for science jobs.
Raised RD age restriction from 7 to 14
Scientist / Roboticist / Xenoblahblahicist from 0 to 14 as well.
2014-08-11 19:08:43 -05:00
Walter0o
dd39fbe985 typo fix 2014-08-11 23:23:38 +02:00
Walter0o
26ae447079 removes pointless has_reagent() checks
remove_reagent() iterates safely through the holder list already,
unless you need to check a minimum amount,
or simply want to know if it is present, the call is not needed.
2014-08-11 13:01:27 +02:00
Walter0o
342fbdd136 fixes #5919 and some other reagent value issues
negative values everywhere.
2014-08-11 12:46:43 +02:00
Walter0o
09d2acee62 fixes #5923
and a few other range issues
2014-08-11 04:45:50 +02:00
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
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
Whitellama
c87ad570f8 Cult tomes can't be destroyed with ethanol 2014-08-10 12:50:53 -07:00
Whitellama
49c8c6f2cb Made arcane tomes a subtype of books, fixes #5838 2014-08-10 02:23:36 -07:00
Whitellama
cfa1ff3440 Fixed Dionaea crashing on death 2014-08-10 01:00:26 -07:00
Walter0o
29ce255597 feedback change on meter improvements
thanks @comma
2014-08-10 06:47:28 +02: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
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
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
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
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
Ccomp5950
74fd47e2de Fixed the font tag on mouse traps description. 2014-08-05 18:55:15 -05:00
Chinsky
2b94441555 Merge pull request #5899 from Ccomp5950/fueltanks-yay
Fueltanks now log and admin_msg when shot at / weldered
2014-08-06 03:13:25 +04:00
Zuhayr
00fc8c53ba Merge pull request #5898 from Walter0o/patch-1
fixes #5876
2014-08-05 13:22:26 +09:30