Commit Graph

14744 Commits

Author SHA1 Message Date
Melvin Kicchi
d20eb6e2cc Fixed footcuff creation glitch
Before this fix, you could  make multiple shackled orange shoes from a single pair
of handcuffs because the pair of handcuffs was never removed from the user's
inventory before it got added to the shoes' contents.
2014-09-17 18:01:04 +02:00
Zuhayr
6621dde3e3 Merge pull request #6418 from meowy/panelpanel
Fixed configuration panel of a few bots reading "panel panel"
2014-09-17 12:37:42 +09:30
Zuhayr
350c3e0c77 Merge pull request #6423 from mwerezak/scrubber
Fixes #6419
2014-09-17 12:37:38 +09:30
mwerezak
aa46da51db Fixes #6419 2014-09-16 22:52:09 -04:00
Ccomp5950
8030c9d771 Merge pull request #6408 from mwerezak/mech-sensor
Fixes mech sensors preventing shuttle undocking
2014-09-16 21:48:31 -05:00
Ccomp5950
0de3a6eaa6 Merge pull request #6406 from mwerezak/debugverb
Changes last debug verb to proc and adds it to debug list
2014-09-16 21:47:07 -05:00
Ccomp5950
1217dd6ff9 Merge pull request #6399 from sick-trigger/master
Some small fixes
2014-09-16 21:46:23 -05:00
Ccomp5950
0ede895e5c Merge pull request #6400 from PsiOmegaDelta/ColdEngine
Map changes
2014-09-16 21:45:46 -05:00
Ccomp5950
ffa44b6509 Merge pull request #6387 from mwerezak/pipes
Increases pump and filter performance
2014-09-16 21:45:32 -05:00
Ccomp5950
faddd0ecea Merge pull request #6413 from Zuhayr/master
Several tweaks/fixes for newhydro.
2014-09-16 21:44:09 -05:00
Zuhayr
24804b314a Should fix clam mode. Wish I could test it here. 2014-09-17 11:37:09 +09:30
Melvin Kicchi
f28c5198c6 Configuration window of floor/med/secbots doesn't read 'panel panel' anymore 2014-09-17 01:28:29 +02:00
PsiOmega
c9dc6c8add Merge remote-tracking branch 'upstream/master' into ColdEngine 2014-09-16 17:23:30 +02:00
Snapshot
56ffecce8c Merge pull request #6398 from PsiOmegaDelta/FiredoorLayer
Changes emergency shutter layer
2014-09-16 08:22:02 -07:00
Snapshot
e1d7108fb1 Merge pull request #6404 from mwerezak/overpressure
Fixes optional argument check
2014-09-16 08:21:30 -07:00
Zuhayr
c83c6b652e Compiile fix. 2014-09-17 00:51:20 +09:30
Snapshot
20b133d683 Merge pull request #6396 from PsiOmegaDelta/SpaceHeaters
Fixes #6390
2014-09-16 08:20:42 -07:00
Zuhayr
46f361e907 Several tweaks/fixes for newhydro. 2014-09-17 00:43:33 +09:30
PsiOmega
63d81cad33 Fixes #6390. Don't know why Kelvin is used but at least it's no longer represented using degC. 2014-09-16 08:05:15 +02:00
mwerezak
2de7df27e0 Fixes mech sensors preventing shuttle undocking
Airlock controllers now use a signal_mech_sensor() proc to send commands
to mech sensors. Docking controllers don't appear to store the mech
sensor tag anywhere so the mech sensor code was left commented out.
2014-09-15 23:56:13 -04:00
mwerezak
590ff03c86 Changes last debug verb to proc and adds it to debug list 2014-09-15 23:31:55 -04:00
mwerezak
a371727ff2 Fixes optional argument check 2014-09-15 21:48:07 -04:00
mwerezak
6b418ee5cb Merge remote-tracking branch 'upstream/master' into pipes
Conflicts:
	code/ATMOSPHERICS/_atmospherics_helpers.dm - Whitespace
2014-09-15 21:34:39 -04:00
Zuhayr
1ec1f2c6d3 Merge pull request #6366 from atlantiscze/cameras-fix-fix
Camera Fix
2014-09-16 01:38:10 +09:30
PsiOmega
56ee7e00b0 Map changes
Makes APCs with different cells specific types.
Replaces arrival's APC with a higher-capacity cell variant to avoid people being unable to leave due to power failure at 12:15.
The engine core now begins without oxygen but still requires cooling and everything else.
2014-09-15 15:30:27 +02:00
Snapshot
12495cbe59 Merge pull request #6378 from PsiOmegaDelta/NinjaSpawn
Sanity checks ninja spawns
2014-09-15 01:01:20 -07:00
sick-trigger
e3395e7618 Clicking on UI storage boxes now uses ClickOn 2014-09-15 17:04:30 +10:00
sick-trigger
d30115f4c5 Disposals install fix 2014-09-15 17:04:30 +10:00
sick-trigger
997e00f332 Soda can transfering fix 2014-09-15 17:04:30 +10:00
PsiOmega
2e8e532082 Decreases the difference to avoid odd layering with tables. 2014-09-15 08:24:45 +02:00
Asanadas
bf411dba3b Merge pull request #6393 from DJSnapshot/hotfix
More fax related things
2014-09-15 01:11:35 -04:00
Snapshot
db36243410 Merge pull request #6380 from Zuhayr/master
Calamity fix.
2014-09-14 22:03:06 -07:00
Zuhayr
1da290d14d Fix for cyborgs becoming lings in calamity mode. 2014-09-15 14:22:33 +09:30
DJSnapshot
0728a1f8e8 gives warden the ability to use faxes 2014-09-14 20:07:00 -07:00
Asanadas
6a973f5b4d Merge pull request #6376 from DJSnapshot/hotfix
bunch o' stuff (Faxes and custom borg fixes)
2014-09-14 21:08:11 -04:00
DJSnapshot
3505ad85d2 Colors fixed. 2014-09-14 17:48:24 -07:00
mwerezak
b865da6cdd Increases pump and filter performance 2014-09-14 18:52:05 -04:00
PsiOmega
ae1a3f3860 Sanity checks ninja spawns
Reduces the risk of ninjas spawning in the middle of space, having no idea which direction the station is.
2014-09-14 21:25:42 +02:00
Chinsky
200a1c0d01 Merge pull request #6328 from atlantiscze/malf-explode-fix
Malfunction Explode Fix
2014-09-14 21:48:57 +04:00
Chinsky
e8f87ceeba Merge pull request #6346 from PsiOmegaDelta/OutpostAirlock
Additional airlock vents in outpost airlocks
2014-09-14 21:47:54 +04:00
Mloc-Argent
9f08551a4c remove lighting area GC for now
it's causing more lag than it's helping

Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/controllers/lighting_controller.dm
2014-09-14 17:40:07 +01:00
Zuhayr
4e68ab210e May fix the debug verbs showing up for non-debuggers. Probably not. 2014-09-15 01:56:38 +09:30
Zuhayr
5bc64c3db3 Hopefully fixes the pAI verb refresh issue. 2014-09-15 01:56:21 +09:30
Zuhayr
24393aa4dc Commenting out two unused vars to get the compile log to look neater. 2014-09-15 01:12:46 +09:30
Zuhayr
fbfdfcc3a5 Should fix repeated antag selection for antag counts below max in calamity mode. 2014-09-15 01:10:25 +09:30
DJSnapshot
e6b5681db0 Rest of the fixes for custom borgs on module reset. 2014-09-14 06:22:46 -07:00
PsiOmega
73bf76db98 No longer presents Kelvin as degrees. 2014-09-14 11:38:03 +02:00
DJSnapshot
01529c0e29 Adds sol gov fax. Makes replies return to sender fax only 2014-09-14 01:47:55 -07:00
PsiOmega
bb1ef08ab3 Merge remote-tracking branch 'upstream/master' into OutpostAirlock 2014-09-14 08:28:57 +02:00
DJSnapshot
0ae3878c13 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into hotfix 2014-09-13 23:10:18 -07:00