Zuhayr
87e0d89e58
Fixes #6726
2014-10-16 14:06:30 +10:30
Zuhayr
ca68281371
Fixes #6727
2014-10-16 14:06:16 +10:30
Zuhayr
adb58be3b0
Fixes #6728
2014-10-16 14:02:10 +10:30
Zuhayr
ff9bd99ee7
Fixes #6731
2014-10-16 13:51:25 +10:30
Zuhayr
b611d6515a
Fixes #6732
2014-10-16 13:48:26 +10:30
Zuhayr
ffae0eee77
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev-freeze
2014-10-16 13:39:00 +10:30
Mloc-Argent
4871a3a850
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Conflicts:
code/ATMOSPHERICS/pipes.dm
icons/atmos/pipes.dmi
2014-10-15 22:13:44 +01:00
Zuhayr
fe677543f4
Merge pull request #6721 from PsiOmegaDelta/LazyCaptain
...
Map changes
2014-10-16 05:29:00 +10:30
PsiOmega
68f4f1809e
AI PDA tapping fix
...
An AI should no longer tap on a non-existing screen with its non-existing fingers while writing PDA messages.
2014-10-15 17:38:54 +02:00
Mloc-Argent
a18c147c37
Merge remote-tracking branch 'upstream/master' into dev
...
Conflicts:
code/ATMOSPHERICS/pipes.dm
icons/atmos/pipes.dmi
2014-10-15 14:40:42 +01:00
PsiOmega
2acd5c22d2
Space icon
2014-10-15 13:08:09 +02:00
PsiOmega
1cabbbf5a6
Master controller no longer annihilate powernets, powernets annihilate themselves.
...
Some misc. changes.
2014-10-15 09:44:15 +02:00
PsiOmega
9bc9698998
Sets turn-off limits based on a standard cell's max charge
2014-10-15 08:14:10 +02:00
Zuhayr
ca13d1d5d8
Fixes chem splicing, bioluminescence and seed packets for xenobotany.
2014-10-15 10:05:50 +10:30
Menshin
70b2c9a1fa
Who thought it was a good idea to omit multiplier for 1x ?!?
2014-10-14 22:48:48 +02:00
Menshin
6387c96bb5
Ambiguous expression readded.
2014-10-14 22:31:19 +02:00
Zuhayr
00e39c1b30
Merge pull request #6715 from Menshin/stacks_href_exploit_fix
...
Prevent stacks multiplier href exploit
2014-10-15 03:22:57 +10:30
Menshin
eb707ea9b6
Prevent stacks multiplier href exploit
2014-10-14 18:34:53 +02:00
PsiOmega
9bcbdc6dc5
Fixes bad tabbing, only evident when placing Z-crossing cables.
2014-10-14 14:14:46 +02:00
Mloc
28e0539359
fix an issue with ZAS geometry not re-forming
...
Signed-off-by: Mloc <colmohici@gmail.com >
2014-10-14 11:57:31 +01:00
PsiOmega
322e03dd06
Makes the number of load/storable character slots a configurable value.
2014-10-14 10:05:22 +02:00
Chinsky
17d5b1dab3
Fixes #6608
2014-10-14 02:19:12 +04:00
Chinsky
ac14ffb455
Fixes #6321
2014-10-14 01:59:48 +04:00
Mloc
be7d30630d
Merge pull request #6697 from Zuhayr/dev-freeze
...
Xenos fixes, dev freeze fixes.
2014-10-13 22:25:22 +01:00
Chinsky
c4bc6c3075
Merge pull request #6707 from Mloc/bs12-overflow
...
fixes #6299
2014-10-14 01:15:03 +04:00
Chinsky
d4b7e2d84b
Merge pull request #6709 from Mloc/bs12-server
...
testing fix for nui resources
2014-10-14 01:14:54 +04:00
Miniature
1bb1045eeb
Fix biosuits hiding shoes when they should not, #6691
2014-10-14 06:29:40 +10:30
PsiOmega
97a5186cee
Converts all machines relying on RandomAPCWires() to the new wire datum system.
2014-10-13 21:46:45 +02:00
Mloc
c6c691bfd9
fixes #6299
...
Signed-off-by: Mloc <colmohici@gmail.com >
2014-10-13 20:35:56 +01:00
Miniature
894ae39f7f
Fix for everyone dying if they don't eat
2014-10-14 05:36:47 +10:30
Mloc-Argent
61839da570
testing fix for nui resources
...
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2014-10-13 20:01:54 +01:00
PsiOmega
f190acf7c5
/tg/'s solar code with a fix for the solar control computer not refreshing on user input.
2014-10-13 17:37:18 +02:00
PsiOmega
a1ee4e766b
Basically ripped over /tg/'s powernet and cable code into our own codebase.
...
Keeps Z-level code as it was.
Modifies/restores powernet procs as necessary to match our own implementation changes.
2014-10-13 17:13:04 +02:00
Zuhayr
01ddc9af6d
Added binary to the AI.
2014-10-13 17:39:00 +10:30
Zuhayr
4c070bad02
Bunch of xeno fixes, details in PR.
2014-10-13 17:32:13 +10:30
Zuhayr
c5e2fa74e6
Fixes #6689
2014-10-13 17:16:23 +10:30
Zuhayr
06ad91f417
Fixes #6695
2014-10-13 17:00:26 +10:30
Zuhayr
45d6d6a610
Added Galactic Common to the AI.
2014-10-13 16:45:58 +10:30
Snapshot
9a706864b3
Merge pull request #6688 from Zuhayr/dev-freeze
...
Dev freeze fixes
2014-10-12 18:07:34 -07:00
Zuhayr
cd2b5e761d
Fixes being unable to knock on windows.
2014-10-13 11:21:37 +10:30
Zuhayr
fa51820244
Fixes #6684
2014-10-13 11:19:12 +10:30
Zuhayr
9c39936640
Fixes #6682
2014-10-13 11:10:46 +10:30
DJSnapshot
b53a89e608
disable typing indicator.
2014-10-12 17:22:30 -07:00
Chinsky
7a6722bc31
Merge pull request #6681 from Baystation12/dev-freeze
...
Dev freeze -> Dev
2014-10-13 03:15:44 +04:00
PsiOmega
ef9cc80603
Adds diagonal cable check on breaker box state change.
2014-10-12 12:55:19 +02:00
PsiOmega
f6bab1bd08
Cherry picking breaker box fix.
2014-10-12 12:49:56 +02:00
PsiOmega
36abc43a7a
Map alterations. Fixes #6677 .
...
Re-organizes maintenance areas, adds missing air alarms, lights and cameras to substations.
Re-adds a number of suddenly missing power cables, mainly affecting security.
Replaces a few instances of blood on the station with oil. Having round-start blood in secluded areas would get annoying fast..
2014-10-12 12:44:13 +02:00
PsiOmega
988d07cefe
Hopefully fixes #6674
...
Breaker boxes would not always place down all the cables necessary to connect power grids on server start.
Moving initialization from the New() to the initialize() appears to have resolved this.
2014-10-12 12:41:38 +02:00
Zuhayr
413af81b80
Fixes humans being able to shred everything with their teeth.
2014-10-12 13:28:46 +10:30
Zuhayr
6d1fd2886b
Added goddamn atrocious wig for Earthcrusher.
2014-10-12 11:58:58 +10:30
