Commit Graph

254 Commits

Author SHA1 Message Date
Zuhayr
53627175ef Merge pull request #7347 from Baystation12/master
Updating dev-freeze from master.
2014-12-10 03:21:56 +10:30
Segrain
4ae3d3029f Fix for #6643. 2014-12-09 14:54:20 +03:00
Segrain
065d9b110c Fix for #6476. 2014-12-09 14:52:43 +03: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
de5c059a01 AI disposal interaction.
The AI can now interact with disposal units and turn the pump on/off.
2014-11-22 11:46:51 +01:00
Zuhayr
4090f04839 Readded monkey dexterity checks in each attack_hand as appropriate. 2014-11-13 17:46:37 +10:30
Zuhayr
90d65aed57 Removed attack_paw, attack_animal and attack_slime. 2014-11-13 17:15:29 +10:30
PsiOmega
bc438e21ad All the relevant examine changes. 2014-11-05 12:44:23 +01:00
Zuhayr
8d9d83d5ef Merge branch 'master' of https://github.com/Baystation12/Baystation12 into dev 2014-10-24 09:12:02 +10:30
Graham Lloyd
c764a94073 fixes some annoying punctuation errors. 2014-10-22 15:58:27 -04:00
PsiOmega
b9235571c4 Plops down a new mining outpost on the asteroid.
Rather than having dirty miners inside the pure temple of science they now have a new tiny little outpost for their ore offloading needs.
2014-10-17 13:49:18 +02:00
Zuhayr
92c92753fb Manual icon file merge. 2014-10-11 06:40:36 +10:30
D Anzorge
7c8e810774 Fix detached disposal bins never changing to attached 2014-10-09 08:09:04 -04:00
Zuhayr
0c83a95b90 Large merge resultion. Used remote for map conflicts. 2014-09-23 21:41:54 +09:30
sick-trigger
d30115f4c5 Disposals install fix 2014-09-15 17:04:30 +10:00
Snapshot
3d81ff6afe Merge pull request #6335 from Zuhayr/dev-freeze
Dev freeze
2014-09-13 00:42:35 -07:00
DJSnapshot
ba27f2e4cc Change to make disposals take about the same amount of time as they did before the new atmos changes. 2014-09-13 00:34:19 -07:00
Zuhayr
1eb759447e Merge resolution, using dev-freeze map due to unreconcilable conflicts. 2014-09-13 16:54:48 +09:30
mwerezak
f3575a6162 Adjusts disposal bin pressure and power 2014-09-12 01:17:53 -04:00
Chinsky
33cf071b57 Fixes #6285
Applied phil235's fix for deconstruction.
5a6e9804b9
2014-09-11 05:17:38 +04:00
mwerezak
762a1d1f03 Increased disposal flow rate and pump power 2014-08-30 16:19:19 -04:00
Whitellama
bc47750801 Added trim to text inputs 2014-08-27 17:52:29 -07:00
Whitellama
c6ae920eda Packages can now be labeled/titled with pens and have sprites to represent they've been labeled or tagged (with the destination tagger) 2014-08-27 13:06:20 -07:00
Walter0o
ff8047baa0 fixes #5907
issue caused by relaymove() not being checked properly.
added comment to prevent this kind of issue in the future.
2014-08-21 15:41:28 +02:00
mwerezak
47b32122d4 Updates disposal bin pressurization
Also tweaks flasher power use.
2014-08-07 19:31:17 -04:00
Loganbacca
6b64fb5e77 Pipe rendering rewrite
- Complete rewrite of pipe rendering code. It now selects icons from a shared cache.
- Manifolds and other devices (pumps, filters, etc.) now match the color of the connected pipes.
- Updated omni devices to use the shared cache.
- Set separate pipe color definitions.
- Cleaned up a lot of pipe code, converting it to absolute paths and removing old commented out code.
- Tweaked t-ray rendering code.
- Tweaked pipe painter.
- Enhanced pipe checking debug command.
- Expanded tank capacity and resprited them.
2014-07-14 19:12:22 +12:00
Mloc-Argent
dd7f0dac0e Merge remote-tracking branch 'upstream/master' into dev
Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/game/machinery/computer/card.dm
	code/modules/mob/living/say.dm
2014-06-20 22:02:40 +01:00
mwerezak
c28fd0ecb5 Adds supply shuttle docking controllers 2014-06-18 21:25:17 -04:00
Boop
b784730ec0 Fixes #5285
will it never end ;~;
2014-06-17 22:41:25 +01:00
Chinsky
6d432d8e9d Merge pull request #5219 from Zuhayr/autolathe
Autolathe rewrite.
2014-06-12 20:28:44 +04:00
Zuhayr
0722775bda Merge pull request #5207 from mwerezak/get_turf_loc-cleanup
Cleans up get_turf_loc()
2014-06-12 18:13:01 +09:30
Zuhayr
136ccc347b Merge with dev. 2014-06-12 01:14:40 +09:30
mwerezak
a8816823a5 Replaces get_turf_loc() with get_turf()
The former does exactly the same thing as get_turf(), except it runtimes
if one of the atoms has a null loc.
2014-06-10 13:43:11 -04:00
Zuhayr
9e7fe6d700 Rewrote autolathe, changed all m_amt and g_amt to a list called 'matter'. Updated RCD vars in view of this. 2014-06-11 01:14:38 +09:30
Boop
168c39dd54 refactors some disposals filtering code and remaps some disposals pipes
New things!
/obj/structure/disposalpipe/tagger
 - retags a holder when it passes through
/obj/structure/disposalpipe/tagger/partial - retags a holder when it passes through two times; good for loop detection
/obj/structure/disposalpipe/sortjunction/wildcard - filters out all holders that are tagged
/obj/structure/disposalpipe/sortjunction/untagged - filters out untagged holders

Tagging doesn't use an icky list index system any more, tags are put into a global list and directly checked against.

Changed the map around a bit, disposals is now a proper loop but anything that's not tagged, is tagged with "Disposals" or anything that passes the tagger twice will be filtered out.

Not a feature, just a fix for drones being sad about weird disposals. <3
2014-06-01 23:30:20 +01:00
Ccomp5950
cb093122d2 Merge branch 'master' of github.com:Baystation12/Baystation12 into dev 2014-05-16 18:11:11 -05:00
Loganbacca
03a01fc805 Closet wrapping fix
- Removed ability to wrap closets if you are inside them
2014-05-14 21:55:51 +12:00
Zuhayr
7574e99acd Added a cooldown to CLONG CLONG from moving in disposals. 2014-05-12 15:00:52 +09:30
Zuhayr
1a24e08f36 Adds drones, drone fabrication, commit options. This is the squashed version of the original 22 commit pull, so I'm summarizing. 2014-05-10 01:40:11 +09:30
Graham Lloyd
72e45ebf7b A first pass at more realistic w_class values 2014-04-03 17:54:06 -04:00
Ccomp5950
e0e1bd9cfb APC Area update initial commit. 2014-03-07 23:42:28 -06:00
Loganbacca
a204a46f4b Runtime fix
- Fixed a runtime caused by effects bumping disposal chutes.
2014-02-22 01:07:45 +13:00
Zuhayr
e870d614c2 Mass correction of controler to controller. 2014-01-25 03:15:13 +10:30
LBraindead
1f9716d1f2 Update disposal.dm 2014-01-18 01:10:18 +01:00
LBraindead
3879477151 Update disposal-construction.dm
new pipe construction
2014-01-18 00:32:06 +01:00
LBraindead
f3240073dc Update disposal.dm
new disposal pipes
2014-01-18 00:31:27 +01:00
Zuhayr
5313851da9 Converted robots over to current blood system/paths, updated various files to work with update. 2013-12-29 02:48:20 +10:30
Zuhayr
8b0f778a83 Mass updates to paths for blood decals. 2013-12-26 01:56:06 +10:30
Cael Aislinn
a4e5bad409 fixes an overwritten fusion reaction, fixes typo on id computer, makes transit tubes traversible, makes conveyor switches access protected
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
2013-10-29 05:10:17 +10:00
Kilakk
15f3e063ab Added a new destination tagger sprite 2013-10-27 22:57:40 -04:00