Zuhayr
1cd00056b5
Merge pull request #9833 from PsiOmegaDelta/150616-ChangelogError
...
Travis - Invalid changelog tags should now fail the build
2015-06-17 00:34:53 +09:30
PsiOmegaDelta
641df4a530
Use of invalid prefixes in changelogs no longer silently fail in Travis.
2015-06-16 11:25:56 +02:00
PsiOmegaDelta
6cf1b7eeb7
Merge pull request #9831 from PsiOmegaDelta/dev-freeze
...
Dev freeze
2015-06-16 10:45:10 +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
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
2881037613
Merge pull request #9824 from GinjaNinja32/logs
...
Fixes some more unbalanced HTML
2015-06-15 15:29:41 +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
f2f05a0336
Tables on other zlevels
2015-06-14 15:22:22 -04:00
mwerezak
dec1461f6c
Fixes chair preview icon
2015-06-14 14:55:04 -04:00
mwerezak
45772952d2
Fixes engineering stacks having only 1 sheet, adds more plastic
...
Workshop now starts with 3x50 steel sheets, 3x50 glass sheets, 2x50
plastic sheets, and 3x10 plasteel sheets.
2015-06-14 14:45:11 -04:00
mwerezak
921d68f353
Glass tables, padded stools
...
Adds glass tables to chemistry, virology, and HOP's office. Replaces
stools with padded stools in various places around medbay and research
2015-06-14 14:21:55 -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
GinjaNinja32
51e4ed31a2
Merge pull request #9816 from Kelenius/ofZippoAndLogs
...
Fixes two log destroyers
2015-06-14 14:13:12 +01:00
Kelenius
86b080769c
Fixes two log destroyers
2015-06-14 15:54:07 +03:00
PsiOmegaDelta
8ed7d6b712
Merge pull request #9811 from PsiOmegaDelta/dev-freeze
...
Dev freeze
2015-06-14 10:50:02 +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
mwerezak
17a84d9dd3
Hotfix for #9235
...
Hotfix for master
2015-06-13 13:37:37 -04:00
Zuhayr
542c5050f8
Merge pull request #9807 from mwerezak/tailicons
...
Fixes unathi tail overlays
2015-06-14 03:01:50 +09:30
GinjaNinja32
de78395e04
Merge pull request #9808 from mwerezak/rwall
...
Updates R-Wall Overlays
2015-06-13 18:25:56 +01:00
mwerezak
70d9c1c01b
Updates rwall overlay
2015-06-13 13:04:48 -04:00
mwerezak
9f1aa4c7ac
Fixes unathi tail icons
...
Updates 6 pixels on the E/W directions on every icon state in tail.dmi
using dmitool.py
2015-06-13 12:20:47 -04:00
mwerezak
0527e4b05f
Adds dmitool import iconstate splicing
...
Adds the ability to splice in specific directions and/or frames when
importing icon states with dmitool.
2015-06-13 12:19:42 -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
Zuhayr
06fb21bba4
Merge pull request #9799 from PsiOmegaDelta/150613-JumpForMeJump
...
Expands admin jump permissions, cuts down on superfluous feedback.
2015-06-13 18:34:35 +09:30
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
mwerezak
1cbfff09d7
Adds python wrapper for dmitool
2015-06-12 00:06:58 -04:00
mwerezak
c38d88c06a
Updates dmitool to be able to insert specific directions
...
Adds a direction option to the import command, that causes the imported
icon state is overwrites the specified direction, if nodup is set.
Otherwise, the direction is overwritten on a copy.
2015-06-12 00:01:41 -04:00
GinjaNinja32
951a7b7347
Cryogenic/robotic storage now uses alt-title for announcements
...
Fixes #9790 .
2015-06-11 21:44:08 +01:00
PsiOmegaDelta
f7aabccab3
Merge pull request #9789 from PsiOmegaDelta/dev-freeze
...
Dev freeze
2015-06-11 12:18:17 +02: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
Mloc
5d1e82cf4d
Merge pull request #9782 from PsiOmegaDelta/150610-AdminNotes
...
Automatic player note fixes.
2015-06-10 17:37:47 +01: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
