Zuhayr
b47d91b612
Merge resolution, master into dev.
2014-08-21 12:01:38 +09:30
Chinsky
fd486ea369
Merge pull request #6064 from PsiOmegaDelta/Announce
...
AI Announcements & Verbs
2014-08-21 01:37:55 +04:00
PsiOmega
a2253617cf
Makes it possible for the AI to make station wide announcements. Improved AI verb handling in case of death/restoration.
2014-08-19 21:09:14 +02:00
Ccomp5950
770fb4de4c
Merge pull request #6052 from PsiOmegaDelta/Mapping
...
Fixes #6027
2014-08-19 12:01:14 -05:00
igalan
322c5b53f2
Fixes #6054
2014-08-19 17:50:55 +01:00
Ccomp5950
264aee843f
Merge pull request #6063 from Whitellama/master
...
Fixed eggs not going back into egg boxes
2014-08-19 06:23:57 -05:00
Ccomp5950
8691d36ea1
Merge pull request #6062 from PsiOmegaDelta/Walls
...
Optimization - Walls deletion
2014-08-19 06:22:31 -05:00
Ccomp5950
cf2be93916
Merge pull request #6056 from mwerezak/dev-fixes
...
Fixes firedoors not opening
2014-08-19 06:02:08 -05:00
Ccomp5950
25506f33fa
Merge pull request #6032 from Walter0o/low_pressure_fix
...
fixes #6005 and broken ancient human low/high pressure code.
2014-08-19 05:54:30 -05:00
Whitellama
26721cf0d5
Fixed eggs not going back into egg boxes
2014-08-19 02:44:58 -07:00
PsiOmega
b3cd08068a
Noted a wall-deletion optimization made over at -tg. Credit to @Aranclanos.
2014-08-19 10:50:17 +02:00
mwerezak
c42d9171d6
Makes power monitor a power machine again
...
Also moved the power monitor code to modules/power
2014-08-19 01:45:23 -04:00
mwerezak
f6f7c82e2a
Fixes firedoors not opening
2014-08-18 22:53:43 -04:00
mwerezak
65bb47b7ec
Setting computer vars on de/construction
2014-08-18 19:35:28 -04:00
mwerezak
52a6f2f9e0
Removes more unused vars from circuitboards
2014-08-18 18:28:39 -04:00
mwerezak
bdb2a45700
Makes power monitor computers actual computers
...
Removes the powernet var from circuit boards. Power monitors get their
powernet from the cable underneath them anyways.
2014-08-18 18:27:51 -04:00
PsiOmega
11ce777d9c
Fixes #6027
...
Creates two proper monitor circuits for Engineering/Mining.
Adds air alarms in the Research access foyer.
Relocates camera in Misc. research to a more central location.
Ensures there are enough Telecommunication Satellite SMES units to meet power demand.
2014-08-18 22:37:54 +02:00
Walter0o
2bb22e5ddb
fixes #6023 and cleans up mechbay.dm
...
- adds tile update on attackby() to fix #6023 using a so far dormant icon state ( line 49 )
- adds missing console initalization on attack_hand() ( line 189 )
- comments unreachable ( via normal means ) mech_bay_power_console/Topic ( line 225 )
- gets rid of relative paths, leaving procs unchanged
note : recharge-floors currently don't care about what direction the console is, unlike the charger-port which always has to be west of the floor.
this should be probably changed to console having to be east of the floor, as most mappers do that anyway and to reduce the chance of future bugs. awaiting feedback on that one.
like the charger and floor.
2014-08-18 15:49:38 +02:00
Chinsky
f9a07a16ef
Merge pull request #6031 from Whitellama/master
...
Adds logs/fingerprints preventing welding fuel grief.
2014-08-18 15:35:14 +04:00
Zuhayr
df6723deb0
Merge pull request #6036 from mwerezak/power-net
...
Fixes laptop power draw, improves cell chargers
2014-08-18 21:04:02 +09:30
Graham Lloyd
75305a0ec4
Comfy chair update, makes armrests show up.
2014-08-17 22:48:38 -04:00
Whitellama
7ced8104ca
Merge branch 'master' of https://github.com/Baystation12/Baystation12
...
Conflicts:
code/game/objects/items/devices/transfer_valve.dm
2014-08-17 17:50:07 -07:00
Zuhayr
8ec28551ba
Merge pull request #6022 from mwerezak/docking
...
Fixes for docking controllers, emergency shuttle and airlock animations
2014-08-18 09:30:17 +09:30
Zuhayr
2033923f8f
Merge pull request #6018 from Hubblenaut/master
...
Patch of fixes for bugs and oversights
2014-08-18 09:28:17 +09:30
Zuhayr
2a6a312dbe
Merge pull request #6019 from mwerezak/radio
...
Fixes machines being able to put the Radio Controller to sleep + Radio Controller cleanup
2014-08-18 09:25:24 +09:30
Zuhayr
b99525dc07
Merge pull request #5999 from GinjaNinja32/LetMeDrive
...
Allows wheelchair occupants to drive if the driving mob is incapacitated
2014-08-18 09:22:32 +09:30
Zuhayr
4e862ec9a7
Merge pull request #6014 from comma/spacearea
...
Replaces /area with /area/space
2014-08-18 09:21:44 +09:30
Whitellama
7539a6a5bb
Added a JMP button to logs when someone adds something to a transfer valve.
2014-08-17 16:06:07 -07:00
mwerezak
6d6413a59b
Fixes laptop power draw, improves cell chargers
...
Cell chargers no longer call use_power() in their process()
2014-08-17 15:30:29 -04:00
Walter0o
e8592d4f41
fixes #6005 and broken ancient human low/high pressure code.
...
-fixes low/high pressure not damaging unsealed/damaged spacesuits.
-refactors procs and adds more comments.
-removes unused/dead code.
2014-08-17 18:06:30 +02:00
Whitellama
da93b893ce
Fixed silly typo.
2014-08-17 03:03:17 -07:00
Whitellama
4bfd59c8d7
Renamed an argument to h ave clearer meaning.
2014-08-17 02:54:35 -07:00
Whitellama
f1494c9b76
Admins now get logs when welding fuel is spilled on the floor, and welding tanks gain fingerprints when someone gets fuel from them.
2014-08-17 02:48:08 -07:00
mwerezak
e1fb63f6e7
Fixes airlock icon state/animation weirdness
...
door_spark and door_deny icon states are usually of a closed door, so it
looks glitchy if they are used when the door is open (such as by pulsing
the ID scan wire).
2014-08-16 21:04:06 -04:00
mwerezak
2bd96ab29e
Fixes multi docking port undocking conditions
...
The undocking conditions for multidocking ports (used by the escape
shuttle) were overly strict, failing if any door was open/unlocked.
Changed to allow undocking if at least one of the inner or outer doors
can close and lock.
2014-08-16 20:50:34 -04:00
Hubblenaut
15ae5ca2a9
Adds JMP button to certain admin logs
2014-08-17 02:21:21 +02:00
Walter0o
f5ca79d003
fixes building more than 1 grille per turf
...
rapidly triggering attack_self() enabled building more than 1 per turf,
which is fairly abusive and not indended.
2014-08-16 22:48:13 +02:00
mwerezak
3c46e4c35b
Fixes airlocks aborting when cycled
...
Fixes airlocks aborting because the doors took too long to close.
2014-08-16 14:39:37 -04:00
Hubblenaut
736741a5c2
Changes 'Lawyer' to 'Internal Affairs Agent' in restricted job lists
2014-08-16 19:08:22 +02:00
Chinsky
72fed65b10
Merge pull request #6011 from PsiOmegaDelta/BrigTimers
...
Unstationary cell status displays now fixed
2014-08-16 10:44:59 +04:00
Chinsky
1de0e2cb44
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into spacearea
...
Conflicts:
maps/tgstation2.dmm
2014-08-16 06:29:55 +04:00
Chinsky
03cdfaf896
Changed /area to /area/space to get rid of anicent and terrible strict typechecks every time you needed to check if it's space area.
2014-08-16 05:28:45 +04:00
mwerezak
d4218e7cd7
Allows airlock access buttons to use ID in hand
2014-08-15 21:01:33 -04:00
Chinsky
f71e43d06c
Moved ambiance sounds out of horrendous ifchain to area definitions.
...
Changed ambiance spamcheck to use time instead of 10 minute spawn.
2014-08-16 04:40:46 +04:00
mwerezak
9d7c5dc197
Gives filters proper names, updates airlocks to use filters
...
Docking ports still don't use filters though, as it would mess with the
docking ports that are also airlocks. Docking is infrequent though so it
should be fine.
2014-08-15 20:27:00 -04:00
mwerezak
edd7a718b2
Moves the radio controller to the controllers dir
2014-08-15 17:05:51 -04:00
Raptor1628
75e63e55a4
More Fixes
...
Changes detective's office to better looking and flowing version, adds a
few more lights in places, updates security job numbers for new spawn
count.
2014-08-15 12:25:56 -04:00
PsiOmega
30cb1a32fb
No more auto-adjustment of cell status displays.
2014-08-15 08:55:55 +02:00
Raptor1628
f1c44601e5
Brig Fixes
...
Fixes a few lighting issues, brig cell doors, adds missing berets to the
wardrobe and closes disposals outlet.
2014-08-14 18:26:17 -04:00
mwerezak
7b4f439cdf
Fixes #6002
2014-08-14 17:37:16 -04:00
