b15c74acd0
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into dev
2014-08-28 18:29:05 -07:00
07da6e25f8
Merge pull request #6184 from comma/detfix
...
Fixed copypaste derp resulting in runtime when you are naked sans gloves...
2014-08-28 11:09:56 +09:30
bc47750801
Added trim to text inputs
2014-08-27 17:52:29 -07:00
c6ae920eda
Packages can now be labeled/titled with pens and have sprites to represent they've been labeled or tagged (with the destination tagger)
2014-08-27 13:06:20 -07:00
ddf860fb13
Update preferences.dm
...
Fixing a merge error.
2014-08-27 20:56:05 +09:30
cf68ad7c87
Master to dev merge.
2014-08-27 20:24:07 +09:30
ac6ffacec8
Merge pull request #6182 from PsiOmegaDelta/HoloAI
...
AI camera/holopad fix
2014-08-27 14:35:34 +04:00
0d6b1aede7
Merge pull request #6170 from mwerezak/shuttle-fixes
...
Fixes shuttle ETA being given before arrive_time is set
2014-08-27 04:24:03 +04:00
eab2ef935b
Fixed copypaste derp resulting in runtime when you are naked sans gloves.
2014-08-27 03:41:11 +04:00
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
f40298715f
Merge pull request #6153 from PsiOmegaDelta/AtmosList
...
Central Atmospherics Computer - Air alarm sub-list
2014-08-26 15:25:59 +04:00
1c2cc138d6
Merge pull request #6168 from Kelenius/OfCablesAndStacks
...
Cables are now stacks
2014-08-26 15:25:31 +04:00
778a0fc608
Removed debug statements
2014-08-26 01:43:54 +01:00
2786c8e8b9
Remote air alarm control for the isolation cells now available on the outpost.
2014-08-25 23:24:35 +02:00
b05f9a16ac
Merge pull request #6155 from LightningIron/master
...
Changes some messages to make more sense
2014-08-25 22:18:49 +04:00
124217fab9
Merge pull request #6134 from PsiOmegaDelta/Construction
...
Fixes #6130
2014-08-25 22:12:28 +04:00
a1348faa8c
Cables are now stacks
2014-08-25 18:54:35 +04:00
f1a1162c3f
Fixes shuttle ETA given before arrive_time is set
2014-08-24 22:43:19 -04:00
4a484d4207
Various grammar and spelling fixes in ion laws
2014-08-24 23:40:25 +01:00
7de4825a87
Changes some messages to make more sense
2014-08-24 14:09:39 -05:00
5924670ca4
Merge pull request #6148 from LightningIron/master
...
Fix for #6131 .
2014-08-24 21:46:03 +04:00
7d18ddfab1
Merge pull request #6146 from PsiOmegaDelta/Dylovene
...
Renames anti-toxin bottles to dylovene.
2014-08-24 21:45:00 +04:00
bd3544be7b
Merge pull request #6145 from Walter0o/hud_update_fix
...
removes duplicate handle_hud_list()
2014-08-24 21:44:49 +04:00
89c160dfd6
Merge branch 'master' of https://github.com/Baystation12/Baystation12
2014-08-23 13:21:06 -05:00
39182f0c8f
Fix for #6131 .
2014-08-23 11:19:15 -05:00
f19001feb8
Renames anti-toxin bottles to dylovene. Soporific tossed out. Sleep toxin renamed to Soporific.
...
Based on http://baystation12.net/forums/viewtopic.php?p=237269#p237269
2014-08-23 17:22:04 +02:00
368f6ef744
removes duplicate handle_hud_list()
2014-08-23 16:23:23 +02:00
d8b803d5e3
Fixes #6130
...
The construction outpost now has an air supply and rudimentary distribution system.
Glass and wood stacks are filled to their max stack sizes, 50 and 32 sheets respectively.
Ghosts can now teleport to Z-level 4.
There are now special air alarms which do not broadcast their alarms. These are used in the mass driver areas to let crew know when it's safe to use them again.
These air alarms have also been installed in the Research isolation cells to finally allow scientists to check what's up, at least as long as they are in there or have AI assistance.
2014-08-23 10:20:24 +02:00
f6e8594a65
Hostile mobs break windows in reasonable order
2014-08-23 01:59:35 +02:00
640144a6e7
Space carp inflict damage to obstacles every 14 seconds
2014-08-23 01:59:35 +02:00
ad387fda96
One can now update crew record photos using a security console.
2014-08-22 19:39:35 +02:00
1a51e72c1a
Merge pull request #6103 from Walter0o/water_fix
...
should fix #6099
2014-08-22 05:04:18 -05:00
d636136e61
Merge pull request #6092 from comma/master
...
Optimized pulse reagent checking a little.
2014-08-22 05:01:41 -05:00
7db352fcc6
Merge pull request #6075 from MrSnapwalk/ertv3
...
ERT update 3: electric boogaloo.
2014-08-22 05:01:02 -05:00
1d9d9f7650
should fix #6099
2014-08-22 00:52:19 +02:00
8163ff7f80
Merge pull request #6087 from mwerezak/power-net
...
Fixes a couple of bugs in apc/process()
2014-08-21 21:53:12 +04:00
871456f131
Merge pull request #6084 from PsiOmegaDelta/MoreNounce
...
Announcement Refactoring
2014-08-21 21:53:03 +04:00
575ce7a6bd
Merge pull request #6093 from Walter0o/disposals_fix
...
fixes #5907
2014-08-21 21:49:21 +04:00
195805636b
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into ertv3
2014-08-21 11:40:35 -05:00
ff8047baa0
fixes #5907
...
issue caused by relaymove() not being checked properly.
added comment to prevent this kind of issue in the future.
2014-08-21 15:41:28 +02:00
f559a7eb85
Merge pull request #6079 from PsiOmegaDelta/PipeDrop
...
Allows clicking floors to drop pipes
2014-08-21 17:34:13 +04:00
f9df93fad0
Expands the use of the new announcement system.
...
Code Green/Blue/Red/Delta, ERT, and captain annoncements now use the new announcement system.
These announcements are stored as newscasts.
2014-08-21 12:58:02 +02:00
e803c90aec
Optimized pulse reagent checking a little.
2014-08-21 13:40:59 +04:00
a80931a6b9
Merge pull request #6069 from comma/photo
...
Added ability to pick photo size.
2014-08-21 03:32:48 -05:00
ed496b8463
Merge pull request #6081 from Walter0o/magical_smes_dev
...
fixes #6046
2014-08-21 12:09:09 +04:00
f2b234fe81
Fixes APCs drawing more power than they can to use to charge
2014-08-21 01:18:26 -04:00
68bf885e6b
Announcement system refactoring.
...
Turns announcements into a datum based system to allow a variety of configurations.
Current configuration options include:
Admin logging
Which sound that should play when announced, if any
If the announcement should be stored as a newscast
Request console/standard announcements currently match priority announcements, but have a smaller style/footprint.
Player announcements now include the assignment and name of the person (or the id rather) who made it.
Have currently only updated the request console and all announcements which previously used captain_announce().
Affected automated announcements, such as shuttle messages, should be exactly the same as before.
2014-08-21 06:34:41 +02:00
ee499426ad
Compile fixes.
2014-08-21 12:19:10 +09:30
b47d91b612
Merge resolution, master into dev.
2014-08-21 12:01:38 +09:30
10f95933dd
Fixes power draw not being processed if no power was available
...
Should address some of the issues raised in Pull Request #6080
2014-08-20 21:54:27 -04:00
Whitellama