Commit Graph

654 Commits

Author SHA1 Message Date
Ccomp5950 cb0eca68ac Merge pull request #7297 from Amunak/pipez
Engine remap, valves now show open/close state on examine.
2014-12-08 20:47:09 -05:00
Mloc efe78df3ff Merge pull request #7299 from Loganbacca/freezefix
Fixes omni-filters not working
2014-12-08 13:17:36 +00:00
Loganbacca 92c81aa958 Fixes omni-filters not working 2014-12-09 01:15:10 +13:00
Amunak fb35debec9 Valves will now tell you if they are open or closed when you examine them. 2014-12-08 12:38:42 +01:00
Mloc 83f2a5ba5a fix some misplaced set_dir()s
fixes part of #7284
fixes #7288
fixes one of #7287

Signed-off-by: Mloc <colmohici@gmail.com>
2014-12-08 10:09:09 +00:00
Mloc-Argent 117ca6a135 refactor 'dir = ' into 'set_dir()'
This should have little/no gameplay effect right now, just paving the
 way for directional lights.
Replaced handle_rotation() on buckly things with this.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2014-12-01 13:44:02 +00:00
PsiOmega c45f77f247 Merge remote-tracking branch 'upstream/dev' into APC 2014-11-19 14:40:18 +01:00
Zuhayr 660b32629e Merge resolution. 2014-11-19 23:19:33 +10:30
RavingManiac 594ac35ce1 Fix for dual-vent-pumps being broken. 2014-11-17 21:33:02 +08:00
PsiOmega ffbbf2b858 Merge remote-tracking branch 'upstream/dev' into APC
Conflicts:
	code/ATMOSPHERICS/components/unary/heat_source.dm
2014-11-16 10:38:01 +01:00
PsiOmega 7ff2e4547b Scrubber Icons
Gives online scrubbers a slightly more appropriate icon while viewed in the map.
2014-11-14 18:48:56 +01:00
Zuhayr 90d65aed57 Removed attack_paw, attack_animal and attack_slime. 2014-11-13 17:15:29 +10:30
PsiOmega 0468f12e91 Merge remote-tracking branch 'upstream/dev' into APC
Conflicts:
	code/game/gamemodes/events/power_failure.dm
	code/modules/power/smes.dm
2014-11-11 14:13:02 +01:00
Zuhayr b4ea25d064 Merge conflict resolution. 2014-11-10 13:00:06 +10:30
Chinsky 4884fe2ba8 Merge pull request #6947 from mwerezak/pipe-cap
Fixes #6299, Again
2014-11-07 03:45:56 +03:00
PsiOmega bc438e21ad All the relevant examine changes. 2014-11-05 12:44:23 +01:00
mwerezak fc6f3ea685 Fixes #6299 2014-11-05 00:03:39 -05:00
Ccomp5950 789906cae2 Merge pull request #6926 from mwerezak/pipe-layer
Fixes #6355
2014-11-04 02:17:41 -05:00
mwerezak 5dcda61181 Fixes #6355
Not sure why it was commented it out, but it seems to be the cause of
the layer issues.
2014-11-02 20:33:41 -05:00
Ccomp5950 0f174fe1ac Merge pull request #6911 from mwerezak/he-pipes
Fixes #6910
2014-11-01 19:53:45 -04:00
mwerezak 17316f912e Fixes #6910 2014-10-31 22:22:52 -04:00
mwerezak f3d423f3d0 Fixes #6746 2014-10-30 00:27:39 -04:00
PsiOmega a1c19b78be Ports more of /tg/'s powernet code.
Among other things this fixes a a bug where SMES would draw excess power from the powergrid they were outputting to, rather than drawing from.
2014-10-29 14:01:35 +01:00
mwerezak 66f2280159 Gas heaters heat faster
Restores a symmetry between heaters and freezers. Also they were nerfed quite a bit when their power use was lowered to 20kW, this undoes the nerf.
2014-10-26 15:16:28 -04:00
Zuhayr d7e2c0fac9 Merge branch 'xenorewrite' of https://github.com/Zuhayr/Baystation12 into xenorewrite 2014-10-01 06:06:10 +09:30
Zuhayr b411da44b8 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev 2014-09-30 23:23:05 +09:30
Zuhayr 223bd86f18 Merge branch 'organremoval' of https://github.com/Zuhayr/Baystation12 into dev
First pass on major conversion of xenomorphs to a human subspecies. Additional condensing of various redundant mob verbs.
Converted larva and diona to their own class, collapsed the rest of xenomorphs into a human species, other stuff.
Completely removed attack_alien(). Still have to reimplement some of the lost behavior for human/alien.
Reapplies lost attack_alien() functionality other than tackling/caressing.
Further alien/humanoid cleanup and xenospawn fix-ups. Also uncommented caste verbs.
Removed half-finished abilities system since species.dm handles it.
All xenomorphs functionality should be working now, other than the HUD, tackling and the xenomorph balance issues.
Added icons for xenomorph castes, moved broadcast languages into datums, removed alien_talk and robot_talk vars.
Merged with organ removal code.
Reapplied verbs to simple_animals/slimes. Updated species definitions to have appropriate organs.
Readded tackle as a human verb.
Borer changes regarding brain removal.
Working on moving the human HUD to the species datum a bit. Mixed results.
Moved Cortical Link to a language, added borer husks.
Tidied up the HUD stuff. Still need to make it rebuild properly when species is changed, but this will do for no
Compile fix, forgot the DME.
Fixed up ventcrawl, added new organ mechanics for dionaea.
Fixed up some overlooked sections causing mobs without brains to die immediately.
Fixed up plasma generation for queens, bugs with organs, force_organ issues with set_species().
2014-09-29 06:19:26 +09:30
mwerezak 5dae1fb667 Fixes pressure regulator flow rate reporting
Fixes the pressure regulator's reported flow rate not being set to 0
when no gas could be transferred.
2014-09-27 19:41:53 -04:00
PsiOmega 93ef5dbe2f Map fixes
Restores maintenance areas to the new variants.
The HoP's office is no longer a crew sleeping quarter.
Fixes disconnected power cables all over the place.
Connects the engineering power monitor to the main/red power grid.
Emergency shutters.
New icon for the research dock.
2014-09-24 15:59:08 +02:00
Zuhayr 0c83a95b90 Large merge resultion. Used remote for map conflicts. 2014-09-23 21:41:54 +09:30
mwerezak 14a213dd86 Fixes #6470 2014-09-20 01:45:06 -04:00
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 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 ffa44b6509 Merge pull request #6387 from mwerezak/pipes
Increases pump and filter performance
2014-09-16 21:45:32 -05: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
mwerezak b865da6cdd Increases pump and filter performance 2014-09-14 18:52:05 -04:00
Zuhayr 24393aa4dc Commenting out two unused vars to get the compile log to look neater. 2014-09-15 01:12:46 +09:30
mwerezak 9f53cb3673 Removes pump heating 2014-09-13 20:41:12 -04:00
mwerezak 1c555f389f Fixes #6348 2014-09-13 14:09:20 -04:00
PsiOmega 1efa1d1ceb Omni-devices should no longer go and turn themselves off permanently in case of power failure. 2014-09-13 10:23:18 +02:00
mwerezak 764ca0874d Heaters/Freezers, Cryo 2014-09-13 02:18:48 -04:00
Zuhayr 9932fae963 Several quickfixes for atmos cooling issues. 2014-09-13 12:56:28 +09:30
Zuhayr 620a790110 Reducing freezer power draw. 2014-09-13 11:31:23 +09:30
mwerezak e7c2cf033e Adds config option for air compression heating 2014-09-12 01:18:12 -04:00
mwerezak 11bdf6f568 Fixes map-set power setting not taking effect 2014-09-12 01:17:34 -04:00
mwerezak b4751e8161 Adds variable power setting to heaters and freezers 2014-09-10 21:14:39 -04:00
mwerezak a8f7093641 Fixes atmos control computers not being able to turn their devices on or off 2014-09-08 23:52:32 -04:00