Ccomp5950
9f57c1b16e
Merge pull request #6012 from Walter0o/gear_fix
...
fixes #6007 and future bugs with gear names
2014-08-15 20:08:25 -05:00
Chinsky
919ecc2a16
Merge pull request #5998 from Walter0o/gripper_fix
...
fixes #5693
2014-08-16 03:47:51 +04:00
Walter0o
a3848871d4
fixes #6007 and future bugs with gear names
2014-08-15 11:11:13 +02:00
Walter0o
de37978995
comment adjustment according to feedback
2014-08-15 06:19:55 +02:00
Chinsky
7351767ef7
Merge pull request #5983 from atlantiscze/co2-breath-fix
...
CO2 Breath fix
2014-08-14 22:58:22 +04:00
Chinsky
07ed87ccd9
Merge pull request #5993 from GinjaNinja32/proximity2
...
More proximity fixes
2014-08-14 22:55:29 +04:00
Walter0o
7236995b0e
fixes #5693
2014-08-14 11:13:12 +02:00
Chinsky
bcf0a57aa0
Merge pull request #5962 from mwerezak/wound-fixes
...
Wound and infection fever fix
2014-08-14 07:55:17 +04:00
Zuhayr
e1953c66cc
Merge pull request #5995 from Hubblenaut/master
...
More admin logs, Rejuvenation fix
2014-08-14 12:16:42 +09:30
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
Hubblenaut
330ce5d088
Fixes rejuvenation ignoring infections
2014-08-14 01:55:30 +02:00
Hubblenaut
c80b921d6b
Logs finishing tank transfer valve bombs and ghosting. Changes pAI request
...
to state the name of the inquirer.
2014-08-14 01:07:09 +02:00
Atlantiscze
ee3072019a
Revert "N2 buildup fix attempt. Putting this into separate commit in case it's not wanted."
...
This reverts commit e8a7b58aff
2014-08-13 23:42:58 +02:00
mwerezak
0b0380ae14
Fixes burn description saying it is salved when not
2014-08-13 17:11:25 -04:00
mwerezak
ca9fc4169d
Fixes infection fever causing burn damage
2014-08-13 17:11:03 -04:00
GinjaNinja32
d1fc12e1c7
More proximity fixes
2014-08-13 20:58:49 +01: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
Atlantiscze
e8a7b58aff
N2 buildup fix attempt. Putting this into separate commit in case it's not wanted.
...
- Right now, air consists of 20% O2 80% N2 (approx.). Breathing takes O2 and turns it into CO2. CO2 gets scrubbed. Pressure drops, vents refill with air which again contains 80% N2 20% O2.
- This means that only 20% of breathed-out oxygen is replenished. Rest is replaced by N2. In large areas, such as Bar, with many mobs this can eventually lead to dangerous atmosphere status.
- This fix, while OOCly slightly unrealistic handles this issue by turning both O2 and N2 into CO2. Tested in CE's office with 5 human mobs without active scrubbers. Air lasts for 2~ hrs. Larger areas of course last significantly longer.
2014-08-13 11:24:12 +02:00
Atlantiscze
ce2e34f5e5
- Fixes breathing not producing CO2. This applied to humans (untested for other races, but probably the same)
2014-08-13 09:02:49 +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
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
44cc7159c4
Fixes a few issues with get_wound_type()
...
Fixes damage causing "healing" wound types that can't bleed.
Fixes flesh wounds not bleeding the instant they heal any damage.
2014-08-11 21:37:34 -04: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
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
mwerezak
8482314541
Fixes runtime in train/explode()
2014-08-10 18:37:39 -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
e7c4f09aad
capsaicin and condensedcapsaicin changes
...
turns them into pain dealing reagents instead of burndamage dealing
2014-08-10 02:47:24 +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
mwerezak
d4c06d0424
Fixes bad entry in rig/sprite_sheets_obj
2014-08-06 14:36:20 -04: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
Ccomp5950
52da372bac
Fueltanks now log and admin_msg when shot at / weldered
2014-08-04 21:11:09 -05:00
Zuhayr
33ef081191
Merge pull request #5895 from mwerezak/fixes
...
Fixes
2014-08-05 08:23:38 +09:30
Walter0o
dcc3393b25
fixes #5876
...
stun beams killed simple animals
2014-08-04 23:41:23 +02:00
Ccomp5950
c3e5cb8eb7
Merge pull request #5885 from Walter0o/lipstick_fix
...
lipstick wiping fix
2014-08-04 15:14:42 -05:00
mwerezak
6a7c9e46e6
Fixes #5881
2014-08-04 13:04:34 -04:00
