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
Zuhayr
5c22ba85c0
Merge pull request #9839 from comma/dev-freeze
...
Fixes
2015-06-17 16:12:08 +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
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
mwerezak
637306eb14
Adds holographic plastic
2015-06-14 22:18:11 -04: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
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
mwerezak
17a84d9dd3
Hotfix for #9235
...
Hotfix for master
2015-06-13 13:37:37 -04:00
GinjaNinja32
8d0c7039df
Changes to dsay
...
- Adds dsay to list of +DEBUG verbs
- Changes dsay to use holder rank rather than trying to guess from rights
2015-06-13 16:46:03 +01:00
Zuhayr
7ff2a9415a
Merge pull request #9805 from GinjaNinja32/follow-with-camera
...
Renames Track-With-Camera to Follow-With-Camera
2015-06-14 00:05:04 +09:30
PsiOmegaDelta
5f925d92c7
Merge pull request #9803 from GinjaNinja32/wizardsuit
...
Wizard suits will now be refitted automatically for non-human wizards
2015-06-13 15:25:35 +02:00
GinjaNinja32
aa3c68d3c2
Renames Track-With-Camera to Follow-With-Camera
...
Title. This means both AIs and ghosts can get space-completion for following a specific mob from 'fol', rather than AIs needing 'tra' and ghosts needing 'fol'.
2015-06-13 14:12:59 +01:00
GinjaNinja32
9613fae16a
Wizard suits will now be refitted automatically for non-human wizards
2015-06-13 13:43:51 +01:00
PsiOmega
d989df7e8c
Adds the Jump-To-X verbs to the list of debug verbs.
2015-06-13 09:53:32 +02:00
PsiOmega
c2f8e1242e
Expands admin jump permissions, cuts down on superfluous feedback.
2015-06-13 08:44:58 +02:00
Zuhayr
572a480679
Merge pull request #9723 from atlantiscze/plant-fix
...
Fixes #9706
2015-06-13 01:38:47 +09:30
Zuhayr
b2dacae3eb
Merge pull request #9791 from GinjaNinja32/cryopod
...
Cryogenic/robotic storage now uses alt-title for announcements
2015-06-12 15:18:41 +09:30
GinjaNinja32
951a7b7347
Cryogenic/robotic storage now uses alt-title for announcements
...
Fixes #9790 .
2015-06-11 21:44:08 +01:00
PsiOmegaDelta
a0dcb04768
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/modules/admin/player_notes.dm
code/modules/admin/topic.dm
2015-06-11 12:06:40 +02:00
GinjaNinja32
d31cf8f3d8
Merge pull request #9786 from LightningIron/dev-freeze
...
Welding tool bugfixes
2015-06-11 09:42:21 +01:00
unknown
c062f886c0
Attempting to weld closet with inactive welder no longer produces message claiming insufficient fuel.
2015-06-10 22:07:52 -05:00
unknown
fe2ce02f54
Fixes #9744 .
2015-06-10 21:50:48 -05:00
Ccomp5950
a2298df036
Merge pull request #9776 from Zuhayr/dev-freeze
...
Fixes
2015-06-10 21:40:20 -04:00
PsiOmega
2bd0d7a2f4
Automatic player note fixes.
...
Player notes should now properly include the relevant admin's ckey.
Automatically adds temporary and permanent bans to the player's notes.
2015-06-10 17:56:31 +02:00
Zuhayr
f9134028b6
Fixes #9777
2015-06-10 23:14:34 +09:30
Zuhayr
48b063a96e
Fixes #9620
2015-06-10 23:14:33 +09:30
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
Zuhayr
8a2c0226dc
Fixes #9597
2015-06-10 23:14:32 +09:30
Zuhayr
4b04b867ac
Fxes #9625
2015-06-10 23:14:32 +09:30
Zuhayr
347e6df2ac
Merge pull request #9704 from atlantiscze/clean-up-your-trash
...
[Done] Implements Destroy()'s on some things
2015-06-10 23:07:38 +09:30
PsiOmegaDelta
e7faa19ea3
Merge pull request #9779 from Baystation12/master
...
Dev-freeze.
2015-06-10 11:04:54 +02:00
