Zuhayr
1eb759447e
Merge resolution, using dev-freeze map due to unreconcilable conflicts.
2014-09-13 16:54:48 +09:30
PsiOmega
d123df4b98
Fixes #6311
2014-09-12 13:59:54 +02:00
Mloc-Argent
11ba197b30
fix for contaminants not processing if air is OK otherwise
...
also a small fix for VV
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2014-09-03 19:00:00 +01:00
Whitellama
71c2317264
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into flame
...
Conflicts:
code/game/objects/items/weapons/storage/belt.dm
2014-09-01 18:31:26 -07:00
Zuhayr
aedb3725f2
Fixes #5874
2014-09-01 23:20:27 +09:30
Zuhayr
066772b1ce
Fixes #5879
2014-09-01 22:45:37 +09:30
Zuhayr
ad2cf64c7b
Fixes #6119
2014-09-01 22:41:15 +09:30
Whitellama
98e287bc6d
Fixed xenobiologist having no preview clothes in character setup
2014-08-31 16:22:43 -07:00
Whitellama
f5c9586153
Fixed matches and candles not being able to burn papers. Also made Diona join prompt appear for a bit longer.
2014-08-31 02:12:04 -07:00
Zuhayr
772715f2da
Merged dev-freeze into master. Two map conflicts, used dev-freeze map.
2014-08-27 20:46:04 +09:30
PsiOmega
0090efb210
Fixes an issue where toggling camera lights would disconnect the AI from an active holopad while keeping the pad online.
2014-08-26 16:38:44 +02:00
mwerezak
aa97002e88
Removes comment, adjusts rel_sizes
2014-08-22 22:09:23 -04:00
Hubblenaut
f6e8594a65
Hostile mobs break windows in reasonable order
2014-08-23 01:59:35 +02:00
Hubblenaut
640144a6e7
Space carp inflict damage to obstacles every 14 seconds
2014-08-23 01:59:35 +02:00
mwerezak
ababfc1d0c
Merge remote-tracking branch 'upstream/dev-freeze' into dev-fixes
...
Conflicts:
code/game/objects/structures/stool_bed_chair_nest/wheelchair.dm
2014-08-22 01:24:34 -04:00
mwerezak
ec52bf830d
Fixes human armor value for full body effects not being weighted by body part
...
This was an issue because it meant that not having hand or feet
protection reduced the player's protection from full body effects much
more than it should have, and meant that not having your hands protected
was just as bad as not having your chest protected.
2014-08-22 01:12:07 -04:00
mwerezak
1477fe17ab
Fixes apply_effect() used without armour checks
2014-08-22 00:02:50 -04:00
mwerezak
170baf15c7
Improves rand_zone() and miss chance procs
2014-08-21 23:32:51 -04:00
Chinsky
e803c90aec
Optimized pulse reagent checking a little.
2014-08-21 13:40:59 +04:00
Zuhayr
ee499426ad
Compile fixes.
2014-08-21 12:19:10 +09:30
Zuhayr
b47d91b612
Merge resolution, master into dev.
2014-08-21 12:01:38 +09:30
Zuhayr
0397ce5f1a
Merge pull request #6076 from Jarcolr/patch-1
...
Fixes #5943
2014-08-21 11:19:30 +09:30
Chinsky
fd486ea369
Merge pull request #6064 from PsiOmegaDelta/Announce
...
AI Announcements & Verbs
2014-08-21 01:37:55 +04:00
Jarcolr
c481d035f5
Fixes #5943
...
Recharging should give rods.
2014-08-20 11:14:54 +03:00
PsiOmega
a2253617cf
Makes it possible for the AI to make station wide announcements. Improved AI verb handling in case of death/restoration.
2014-08-19 21:09:14 +02:00
Ccomp5950
25506f33fa
Merge pull request #6032 from Walter0o/low_pressure_fix
...
fixes #6005 and broken ancient human low/high pressure code.
2014-08-19 05:54:30 -05:00
Ccomp5950
3c9fa8ba61
Merge pull request #6050 from mwerezak/breathing
...
Simplifies handling of inhale_pp
2014-08-19 05:52:37 -05:00
mwerezak
f9b4a78405
Fixes exhaling/inhaling types, cleanup
2014-08-18 14:58:18 -04:00
mwerezak
b04ac56d45
Cleanup/adjustment of inhale_pp handling
2014-08-18 13:33:51 -04:00
Zuhayr
65a31f2dc2
Merge pull request #6026 from mwerezak/internal-bleeding
...
Implements IB changes discussed in forum thread
2014-08-18 09:32:00 +09:30
Zuhayr
2033923f8f
Merge pull request #6018 from Hubblenaut/master
...
Patch of fixes for bugs and oversights
2014-08-18 09:28:17 +09:30
JimTheCactus
e74d92370d
Added a forced, immediate refresh of the icons after the character is made.
...
This eliminates a race condition between spawning in and the icon cache being updated to include the body.
2014-08-17 12:34:02 -06:00
Walter0o
e8592d4f41
fixes #6005 and broken ancient human low/high pressure code.
...
-fixes low/high pressure not damaging unsealed/damaged spacesuits.
-refactors procs and adds more comments.
-removes unused/dead code.
2014-08-17 18:06:30 +02:00
Chinsky
c660734299
Added probability scaling for non-damage events.
...
Fixed typo.
2014-08-17 11:05:17 +04:00
mwerezak
5b341bd810
IB initial damage now depends on damage taken
...
Also, autohealing IBs no longer stop bleeding, but do stop worsening.
2014-08-16 22:00:55 -04:00
Hubblenaut
d122ec9979
Sleeping people on chairs can be woken up
2014-08-17 02:34:26 +02:00
Hubblenaut
48655479b7
Hardcrit is entered immediately and lasts for 300 seconds instead of 250 (at max)
2014-08-17 02:21:31 +02:00
Hubblenaut
15ae5ca2a9
Adds JMP button to certain admin logs
2014-08-17 02:21:21 +02:00
Chinsky
09561db2d0
Added coefficient to scale speed of rads. Currently it's 10x slower than it was.
...
Added humans going bald on high rads levels.
Added a chance to get sick burn on highest rad level.
Replaced mutations (turning deaf/blind is unfun, and slowing rads would raise the chance of it happening) with a a chance of small genetic damage.
2014-08-16 09:32:24 +04:00
Chinsky
919ecc2a16
Merge pull request #5998 from Walter0o/gripper_fix
...
fixes #5693
2014-08-16 03:47:51 +04: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
658941a0f9
Merge pull request #5978 from Zuhayr/journalism
...
Mining changes and basic character backgrounds.
2014-08-14 10:54:49 +04: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
04bf4c7d90
Merge pull request #5981 from Walter0o/sound_removal
...
removes unused AI text2speech files and code
2014-08-14 12:02:10 +09:30
MrSnapwalk
6b44ef8ff1
Adds new hair.
2014-08-13 20:15:07 -05:00
Hubblenaut
330ce5d088
Fixes rejuvenation ignoring infections
2014-08-14 01:55:30 +02:00
