PsiOmegaDelta
cf10dc38b1
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
.travis.yml
code/game/atoms.dm
code/modules/mob/living/carbon/human/human.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/living/carbon/monkey/life.dm
code/modules/mob/living/silicon/silicon.dm
2015-06-30 08:24:43 +02:00
PsiOmega
7e33beab0f
Fixes drone runtime.
...
Spawning drones no longer cause runtimes. Fixes #9909 .
2015-06-28 19:02:23 +02:00
Chinsky
9cfd04f959
Merge pull request #9952 from mwerezak/camera-console-fix
...
Fixes #7910
2015-06-28 19:42:00 +03:00
mwerezak
4062f81f20
Fixes #7910
...
Partial port from vgstation.
Notable differences:
handle_regular_hud_updates() is called anytime view is reset, instead of
just from the cancel camera verb. check_eye() now returns the vision
flags to be set on the viewer. Moved cameraFollow to silicon. Camera
consoles now call reset_view explicitly when they want to change a mob's
view, instead of leaving it as a side effect of check_eye()
2015-06-28 11:59:19 -04:00
Zuhayr
411987c68b
Merge resolution with master.
2015-06-28 06:02:52 +09:30
GinjaNinja32
3c3d6f3497
Un-breaks hats, semi-fixes #9873 , partially reverts #9937
2015-06-27 08:59:27 +01:00
PsiOmega
6c891406f9
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/modules/mob/update_icons.dm
code/setup.dm
2015-06-26 19:22:31 +02:00
PsiOmegaDelta
8fef02501c
Merge pull request #9936 from mwerezak/fire
...
Balances fire to work better with very low concentration phoron gas burning
2015-06-26 13:34:21 +02:00
mwerezak
1b978f9570
Makes update_inv_head() respect item_state and item_icons
...
Fixes #9873
2015-06-26 01:34:15 -04:00
mwerezak
56065022a7
Updates fire_act() implementations to work better with lower temperature fires
...
In some cases fire_act() wasn't even checking the applied temperature. Reworks how fire damages flooring.
2015-06-26 00:40:55 -04:00
mwerezak
9d7a1b9ad6
Fixes misleading path and proc name
2015-06-26 00:40:31 -04:00
Chinsky
265b1d5b51
Fixes #9913
...
Also axes hidden var in lieu of using implants like other foreign objects. Now instead of one object, amount of stuff you can put in someone's organ is restricted by stuff's combined w_class.
2015-06-25 23:51:58 +03:00
Chinsky
9d03286b6c
Added yet another special snowflake check for assistants so they'd get properly dressed on preview icon.
2015-06-25 23:04:33 +03:00
Chinsky
e6b4cecf50
Fixes #9519
...
Now client can't escape the resetting!
2015-06-25 21:09:51 +03:00
Chinsky
8bb0f7496e
Merge pull request #9900 from mwerezak/extinguisher
...
Changelog, fire patting
2015-06-23 06:46:34 +03:00
mwerezak
4961efec0f
Adjusts patting to account for shorter timeout
2015-06-22 22:17:30 -04:00
GinjaNinja32
9c32851ba5
Merge pull request #9871 from mwerezak/extinguisher
...
Fire Extinguishers
2015-06-22 15:36:55 +01:00
GinjaNinja32
7f319f528a
Merge pull request #9875 from Zuhayr/dev-freeze
...
Antag system fixes
2015-06-21 12:07:50 +01:00
Zuhayr
ec5e05b9f1
Antagonist system refactor. Fixes #9495 , #9290 , #9521 , #8800 and #9465 .
2015-06-21 18:08:26 +09:30
PsiOmegaDelta
9426d0844c
Merge pull request #9872 from mwerezak/earslot
...
Fixes #9514
2015-06-21 09:03:00 +02:00
mwerezak
f8d5127078
Adds SLOT_EARS to various items
2015-06-21 01:45:43 -04:00
mwerezak
a4fb9fbb51
Patting out flames is no longer extremely effective
2015-06-21 00:44:14 -04:00
PsiOmegaDelta
4a5da7221c
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/modules/mob/living/carbon/resist.dm
2015-06-20 20:24:05 +02:00
PsiOmegaDelta
33dc2e5811
Merge pull request #9867 from Zuhayr/dev-freeze
...
More fixes
2015-06-20 19:05:32 +02:00
Zuhayr
6fff0069db
Fixes # #8327
2015-06-21 01:48:15 +09:30
Zuhayr
7c1696c3c8
Fixes #9435
2015-06-21 01:27:23 +09:30
Zuhayr
f371da4ae9
Merge pull request #9838 from mwerezak/stunrevolver
...
Assorted small dev-freeze tweaks, stunrevolver fix
2015-06-21 01:16:58 +09:30
Zuhayr
e13c4a2243
Fixes #7828
2015-06-20 21:57:03 +09:30
HarpyEagle
ccb12556d6
Fixes #9624
2015-06-18 16:31:29 -04:00
HarpyEagle
44644d34b4
Restores stop drop and roll time
...
Returns the duration of stop drop and roll to 3 seconds. The amount of
removed fire stacks was reduced by ~3/5 instead of lengthening the time.
2015-06-18 12:55:31 -04:00
HarpyEagle
5c1499ff1f
Merge remote-tracking branch 'upstream/dev-freeze' into stunrevolver
2015-06-18 12:54:43 -04:00
HarpyEagle
4b441bc293
Adjusts animate_tail_once duration
2015-06-18 12:53:20 -04:00
HarpyEagle
b26edd690c
Certain sidearms now use the lighter gunshot sound
2015-06-17 09:59:40 -04:00
GinjaNinja32
078cfb2533
Merge pull request #9774 from mwerezak/chem-touch
...
Reagent splashing, mob fire
2015-06-17 10:05:11 +01:00
mwerezak
73333ac9c8
Moves metabolism to a holder subtype
2015-06-16 16:26:06 -04:00
mwerezak
70433b4367
Makes showers wash away touching reagents
...
Also moves reagent permeability to it's own proc, and makes splash_mob respect copy
2015-06-16 16:26:04 -04:00
PsiOmegaDelta
37f59551fc
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/objects/items/devices/PDA/PDA.dm
code/modules/reagents/reagent_containers/glass.dm
2015-06-16 10:30:50 +02:00
PsiOmegaDelta
93c3d03801
Merge pull request #9817 from GinjaNinja32/records
...
'Fixes' NanoUI locking up on medical/security records
2015-06-15 15:30:08 +02:00
GinjaNinja32
0423691ca2
Missed a span
2015-06-15 12:20:16 +01:00
GinjaNinja32
4da75dba68
Fixes some more unbalanced HTML
2015-06-15 10:48:30 +01:00
GinjaNinja32
3c525e907a
'Fixes' NanoUI locking up on medical/security records
2015-06-14 14:44:38 +01:00
mwerezak
ad24805eb8
Mob fire temperature fix, tweaks
...
Mob fires are now guaranteed to burn at least as hot as a cold flame -
no more merely warming mobs up slightly with low fire stacks.
Also made mob fires burn hotter overall and resisting slower.
2015-06-13 15:45:52 -04:00
Zuhayr
cef958cac2
Fixes #9503
2015-06-10 23:14:33 +09:30
Zuhayr
018c3fc2aa
Fixes #9517 and #9542
2015-06-10 23:14:33 +09:30
PsiOmegaDelta
e7faa19ea3
Merge pull request #9779 from Baystation12/master
...
Dev-freeze.
2015-06-10 11:04:54 +02:00
PsiOmegaDelta
1efd3f9394
Merge pull request #9775 from mwerezak/mrowl
...
Fixes tajaran name generation, tweaks
2015-06-10 07:59:10 +02:00
mwerezak
58d512d1e6
Fixes tajaran name generation, tweaks
2015-06-10 00:53:24 -04:00
PsiOmega
3591bd5599
Travis now builds using version 508.1287
...
throw is now a keyword. Updates usages where necessary to allow compilation.
2015-06-09 15:36:27 +02:00
PsiOmegaDelta
97f49bb982
Merge pull request #9756 from Baystation12/master
...
Dev-freeze
2015-06-09 12:12:40 +02:00
PsiOmega
13cb32fa7f
Another MayRespawn() fix.
...
Being unable to reenter your body now allows you to respawn, even if your body lives.
2015-06-08 17:39:25 +02:00
