Commit Graph

17931 Commits

Author SHA1 Message Date
Zuhayr
8305dd65a3 Merge pull request #10011 from GinjaNinja32/robot-inventory
Changes cyborg HUD to not display a superfluous empty row
2015-07-06 05:55:34 +09:30
Chinsky
c5eb043a46 Merge pull request #9998 from Kearel/trayFix
Fixing Tray Bug
2015-07-05 20:10:26 +03:00
PsiOmegaDelta
1910a9a12d Merge pull request #10016 from mwerezak/airlockfix
Airlock and atmos machine fixes
2015-07-05 08:43:16 +02:00
mwerezak
1abb52532d Merge branch 'atmosfix' into airlockfix 2015-07-05 01:20:33 -04:00
mwerezak
bd59733fdb Fixes #9714
Fixes incorrect arguments to calculate_transfer_moles()
2015-07-05 01:18:38 -04:00
mwerezak
6b550f7166 Fixes more instances of = instead of += inside loop 2015-07-05 01:02:52 -04:00
mwerezak
c46f32e8d7 Airlock controller fixes
Fixes airlocks opening their doors before the pumps have turned off.
Fixes airlocks getting confused if you mash buttons in quick succession.
2015-07-04 23:49:54 -04:00
GinjaNinja32
b8e0015be1 Changes cyborg HUD to not display a superfluous empty row
Title. Modules with precisely 8, 16, 24 etc items were showing an extra row, this changes it from floor(X/8)+1 to just ceil(X/8).
2015-07-04 14:47:10 +01:00
ccomp5950
9bcc061d1f DSAY will now list that it's dsay in log instead of generic log_admin 2015-07-03 15:03:51 -04:00
Kearel
9a6391747d fix trays
Puts pikcup proc before loc is changed.
2015-07-02 13:55:27 -05:00
Chinsky
42a1ad8b81 Merge pull request #9985 from GinjaNinja32/teleport
Fixes the third teleportation effect
2015-07-02 09:13:03 +03:00
GinjaNinja32
7b1d9a54be Fixes the third teleportation effect
why isn't this a proc
2015-07-02 06:36:30 +01:00
Chinsky
0b9d9167f7 Merge pull request #9980 from mwerezak/supermatter
Fixes #9591
2015-07-02 06:07:42 +03:00
mwerezak
5ec5fdeb46 Fixes #9591
Adjusts supermatter radiation range and intensity
2015-07-01 01:18:14 -04:00
PsiOmega
15c165f4e5 Fixes #7042.
Fixes issues with the AI centering on its core whenever it's attached to machinery.
Previously fixed on dev-freeze.
2015-06-30 20:09:10 +02:00
GinjaNinja32
ebf037af5e Fixes an infinite loop issue
Title. reset_view() called handle_regular_hud_updates() called check_eye() called reset_view() [...]
2015-06-30 06:26:51 +01:00
Chinsky
9cfd04f959 Merge pull request #9952 from mwerezak/camera-console-fix
Fixes #7910
2015-06-28 19:42:00 +03:00
mwerezak
4062f81f20 Fixes #7910
Partial port from vgstation.

Notable differences:
handle_regular_hud_updates() is called anytime view is reset, instead of
just from the cancel camera verb.  check_eye() now returns the vision
flags to be set on the viewer.  Moved cameraFollow to silicon. Camera
consoles now call reset_view explicitly when they want to change a mob's
view, instead of leaving it as a side effect of check_eye()
2015-06-28 11:59:19 -04:00
PsiOmegaDelta
b482c5c07d Merge pull request #9958 from GinjaNinja32/botfix
(probably) fixes an issue where the server hangs at roundstart if the IRC bot doesn't respond properly
2015-06-28 12:48:54 +02:00
GinjaNinja32
9a9f8e5563 (probably) fixes an issue where the server hangs at roundstart if the IRC bot doesn't respond properly 2015-06-28 11:43:53 +01:00
GinjaNinja32
3c3d6f3497 Un-breaks hats, semi-fixes #9873, partially reverts #9937 2015-06-27 08:59:27 +01:00
Chinsky
be24aa0272 Merge pull request #9935 from GinjaNinja32/irc_notification
Fixes certain modes not sending the 'A round of [x] has ended' notification at round-end
2015-06-27 01:09:37 +03:00
GinjaNinja32
61cd53e265 Merge pull request #9944 from Ravensdale/master
Remove posi-mmi-mechs
2015-06-26 21:31:02 +01:00
Ravensdale
ba3d180db6 Remove posi-mmi-mechs
fix

actual removal
2015-06-26 12:37:37 -07:00
GinjaNinja32
98572db1a0 Merge pull request #9940 from atlantiscze/connection_estabilished
Fixes #9929
2015-06-26 19:24:24 +01:00
Atlantis
90f08d3fa7 Fixes #9929
- Adds missing connect_to_network() and disconnect_from_network() into TEG wrenching code.
2015-06-26 18:22:59 +02:00
Chinsky
ed779b7ff9 Merge pull request #9937 from mwerezak/master-fixes
Fixes
2015-06-26 09:19:48 +03:00
mwerezak
c6c200c127 Fixes #9251 2015-06-26 01:38:04 -04:00
mwerezak
242f5c5dfd Fixes #9928 2015-06-26 01:35:35 -04:00
mwerezak
1b978f9570 Makes update_inv_head() respect item_state and item_icons
Fixes #9873
2015-06-26 01:34:15 -04:00
GinjaNinja32
94ffb49bfb Fixes certain modes not sending the 'A round of [x] has ended' notification at round-end 2015-06-26 01:04:03 +01:00
GinjaNinja32
5906ae7556 Adds 'age' command to world.Topic, for the IRC bot. Also runs all keys through ckey() before using them, to avoid easily-fixed errors 2015-06-25 22:52:36 +01:00
PsiOmega
3b935ce854 Fixes #9813.
Cutting fire alarm wiring now produces cables.
2015-06-23 18:15:30 +02:00
Vivalas
06ce7e8973 Update smartfridge.dm 2015-06-21 18:33:07 -05:00
Vivalas
0035a3a5b8 Fixes tracking implants 2015-06-21 14:17:49 -05:00
Chinsky
45e0f1b233 Merge pull request #9859 from mwerezak/bucklefix
Fixes #9624
2015-06-20 01:00:48 +03:00
HarpyEagle
ccb12556d6 Fixes #9624 2015-06-18 16:31:29 -04:00
Ccomp5950
eea423ce0f Merge pull request #9857 from GinjaNinja32/bot
Adds support for bots which use world.Export() for server-to-bot communication
2015-06-18 13:46:50 -04:00
Ccomp5950
7ee7cafbff Merge pull request #9846 from GinjaNinja32/irc
Allows setting the URL for the IRC bot to report separately from the main SERVER config setting
2015-06-18 13:46:32 -04:00
GinjaNinja32
8d232e9304 Adds support for bots which use world.Export() for server-to-bot communication 2015-06-18 18:34:55 +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
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
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
Zuhayr
6751b8113c Merge pull request #9806 from GinjaNinja32/dsay
Changes to dsay
2015-06-14 15:34:41 +09:30
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