PsiOmegaDelta
125090b85b
Merge remote-tracking branch 'upstream/dev' into 150616-Uplink
...
Conflicts:
code/game/antagonist/station/traitor.dm
2015-06-17 15:11:38 +02:00
PsiOmegaDelta
5b4dfdda9c
Allows one to define list of random selection items.
...
Includes a default list with a couple of semi-randomly selected probabilities.
2015-06-17 15:04:06 +02:00
GinjaNinja32
078cfb2533
Merge pull request #9774 from mwerezak/chem-touch
...
Reagent splashing, mob fire
2015-06-17 10:05:11 +01:00
GinjaNinja32
a60b91fd1b
Adds a new configuration value, SERVERURL, for the IRC bot to use if set
2015-06-17 10:00:35 +01:00
PsiOmegaDelta
4deba764a0
Compilation fixes.
2015-06-17 09:41:13 +02:00
PsiOmegaDelta
772488fadc
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
.travis.yml
code/setup.dm
maps/exodus-1.dmm
maps/exodus-5.dmm
2015-06-17 09:33:34 +02:00
Zuhayr
5c22ba85c0
Merge pull request #9839 from comma/dev-freeze
...
Fixes
2015-06-17 16:12:08 +09:30
Zuhayr
167655b681
Merge pull request #9823 from PsiOmegaDelta/150615-MapTweaks
...
Map tweaks.
2015-06-17 16:11:14 +09:30
Zuhayr
031c7db3e5
Merge pull request #9821 from mwerezak/tableshaveturned
...
Makes standard tables plastic, related changes
2015-06-17 14:35:22 +09:30
Chinsky
b2779d6302
Fixes #9538
...
One does not simply qdel a list. Should be fine since it doesn't hold any objects, just bunch of strings.
2015-06-17 06:57:38 +03:00
Chinsky
5754c4edf7
Fixes #9211
...
Instead of several minutes long spawn, blood is added to processing for drying out now. Processing proc itself is just compraing two vars so shouldn't be as bad.
This way it doesn't get referenced by unnamed proc and can be qdel'd properly.
2015-06-17 06:50:08 +03:00
Chinsky
cc4f4d7bb2
Fixes #9834
2015-06-17 03:22:27 +03: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
mwerezak
4cb70b2b94
Ingesting diseased blood contracts the disease
...
Only if the disease is a contact type disease. The same restriction is
also applied to touching diseased blood.
2015-06-16 16:26:02 -04:00
mwerezak
f0c096627c
Matches can be used to light things in adjacent turfs when thrown
2015-06-16 16:25:59 -04:00
PsiOmegaDelta
5ac575f579
Yet another span fix.
2015-06-16 11:09:36 +02:00
PsiOmegaDelta
307f36e919
Compilation fixes.
2015-06-16 11:03:25 +02:00
PsiOmegaDelta
e094ca3d26
Span correction.
2015-06-16 10:59:45 +02:00
PsiOmegaDelta
06a1ece4b8
Merge remote-tracking branch 'upstream/dev-freeze' into dev
...
Conflicts:
code/ZAS/Controller.dm
code/datums/mind.dm
code/game/objects/items/devices/scanners.dm
code/game/objects/items/stacks/sheets/glass.dm
code/modules/materials/materials.dm
code/modules/mob/living/carbon/brain/posibrain.dm
code/modules/mob/living/silicon/pai/pai.dm
2015-06-16 10:52:33 +02: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
GinjaNinja32
3291e4264c
Merge pull request #9829 from comma/ghett_ophthalmology
...
Updated penlight
2015-06-16 09:14:14 +01:00
PsiOmegaDelta
cc7c502fb8
Updates emag attackby usages to emag_act where it's not too much of a headache.
2015-06-16 09:34:13 +02:00
Chinsky
c96fee8942
Merge pull request #9819 from PsiOmegaDelta/150614-SpanMatch
...
Travis span matcher script
2015-06-16 03:40:10 +03:00
Chinsky
dacc6cbd7c
Thefication
2015-06-16 02:50:25 +03:00
Chinsky
97974cbb7a
Updated penlight.
...
Cleaned up code a bit (holy shit those long conditions), axed yet another monkey mode check.
Made penlights aware of organs.
Added few more conditions that could be diagnosed with it - brain damage, drugs use, eye damage (surprising huh)
2015-06-16 00:38:46 +03:00
PsiOmega
6373f3391f
Fixes #9219 .
...
Editing lists is now logged.
2015-06-15 18:29:07 +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
PsiOmegaDelta
dea924541c
Emag refactoring.
...
Emags now call a dedicated emag_act proc on atoms which then returns how many charges that should be use up.
2015-06-15 15:22:32 +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
PsiOmegaDelta
135d0fb515
Map tweaks.
...
Secure windoors now all use the pre-defined direction instances.
Replaces all border emergency shutters with the base variant because they have become mixed, unmatched, and are generally inconsistent in their use (understandable seeing as we don't have border icons).
Rotates the fore bridge blast doors 90 degrees.
2015-06-15 09:08:34 +02:00
mwerezak
637306eb14
Adds holographic plastic
2015-06-14 22:18:11 -04:00
PsiOmega
0a05c2659f
All the span-corrected dm files.
2015-06-14 22:08:14 +02:00
mwerezak
eb0f1fa69e
Makes R-walls double plasteel
...
Makes R-walls double plasteel like on master, adjusts plasteel integrity
so that R-walls have the same health as on master as well.
2015-06-14 15:33:48 -04:00
mwerezak
dec1461f6c
Fixes chair preview icon
2015-06-14 14:55:04 -04:00
mwerezak
0d6dfd899a
Makes standard tables plastic
...
Makes standard tables plastic, readds steel tables to various places,
mainly around engineering and maintenance. Makes shuttle tables
reinforced.
2015-06-14 13:38:56 -04:00
GinjaNinja32
3c525e907a
'Fixes' NanoUI locking up on medical/security records
2015-06-14 14:44:38 +01:00
Kelenius
86b080769c
Fixes two log destroyers
2015-06-14 15:54:07 +03:00
Mloc
a006089b2a
Merge pull request #9801 from Iamgoofball/patch-3
...
Autolathe now spits out stuff on it's location instead of at your feet
2015-06-14 13:23:27 +01:00
PsiOmega
1a7e8976af
mob/living/Life() now handles fire.
...
Aliens (largery un-used on Bay) and robots now deal with fire differently.
2015-06-14 11:47:11 +02:00
PsiOmega
03be640d01
mob/living/Life() now handles random events (vomiting etc).
2015-06-14 11:17:04 +02:00
PsiOmega
a14406f83a
mob/living/Life() now handles blood.
2015-06-14 11:14:31 +02:00
PsiOmega
240aed884e
mob/living/Life() now handles chemicals in the body.
2015-06-14 11:03:03 +02:00
PsiOmega
9d90691605
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/game/gamemodes/wizard/spellbook.dm
2015-06-14 10:35:29 +02:00
Zuhayr
6751b8113c
Merge pull request #9806 from GinjaNinja32/dsay
...
Changes to dsay
2015-06-14 15:34:41 +09:30
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
GinjaNinja32
5e2a95468a
Merge pull request #9809 from mwerezak/zonemerge-master
...
Hotfix for #9235
2015-06-13 18:47:54 +01:00
PsiOmega
8279cc48d8
mob/living/Life() now handles mutations and radiation.
2015-06-13 19:40:24 +02:00
mwerezak
17a84d9dd3
Hotfix for #9235
...
Hotfix for master
2015-06-13 13:37:37 -04:00
