e3ad4dc013
Fixed #8602
2015-03-30 21:59:50 +03:00
6d15809768
Corrects return values for the Topic procs of several computers and some other machines as well.
2015-02-25 21:32:35 -05:00
a8089d4437
Merge master into dev.
2015-02-12 23:01:08 +10:30
30de86c081
Accessories update.
...
Moves them away from 'tie' legacy - path change, and different code files.
Changed single hastie var into accessories list, to allow multiple articles worn at same time. Updated all affected places in code to work with it.
Currently any number of decorative accessories can be attached, one utility (holster/webbing) and one armband.
2015-02-08 12:35:50 +03:00
71dabeb557
Fixes ore scanner
...
Before: it didn't scan dark tiles and the tile you were standing on.
Now: scans both.
2015-02-08 05:52:12 +03:00
1eaf311b25
Merge pull request #7887 from Zuhayr/pickaxes
...
Renames pickaxes to drills, resprites accordingly.
2015-02-04 06:32:37 +01:00
11ec632c22
Merge branch 'randmap' of https://github.com/Zuhayr/Baystation12 into randmap
2015-02-04 11:03:44 +10:30
3402912335
Merge with dev.
2015-02-04 11:03:13 +10:30
5ed006bcf0
Merge pull request #7902 from Kelenius/ofCratesAndMastermind
...
Changes abandoned crate contencs and replaces minispess with mastermind
2015-02-03 18:15:35 +03:00
10de826ca3
Removes FPRINT and TABLEPASS flags
2015-01-23 22:27:32 +03:00
c444dc5f41
Updates crate contents
2015-01-23 20:42:21 +03:00
cd494cdef1
Added masking turf for asteroid field, fixed issues with distribution map. Replaced asteroid field with mask turf.
2015-01-23 13:40:05 +10:30
07793edc85
Converted mining map over to this new system. Currently broken.
2015-01-23 13:40:03 +10:30
ea0b42e1e8
Renames pickaxes to drills, resprites accordingly.
2015-01-20 19:26:22 +10:30
6f4f720016
Removes empty crates and replaces minigame with mastermind
2015-01-19 20:36:05 +03:00
5b03184e9c
Merge pull request #7491 from Mloc/bs12-sleepyedges
...
atmos changes; sleepy edges and hardy rwalls
2014-12-22 20:04:08 +01:00
cf15517f8a
fix up airless turfs to be actually airless
...
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2014-12-21 20:36:11 +00:00
417fe41248
Mining items path formatting
2014-12-18 04:58:40 +01:00
3815ac146f
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into pewPEWPEWboom
...
Attempt to resolve merge conflict.
2014-12-07 04:33:46 +01:00
4582c0038b
Merge pull request #7205 from Mloc/bs12-setdir
...
refactor 'dir = ' into 'set_dir()'
2014-12-02 14:38:31 +01:00
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
64f9a502f9
Mining robot module upgrade
...
- Mining cyborgs can now properly work with drills.
- Mining cyborgs have received ore scanner, crowbar, and limited version of magnetic gripper.
- Mining cyborgs can now swap power cells inside mining drills, as well as upgrade them if provided better parts.
- As a bonus, cyborgs can now see how much ore is in ore boxes (because it makes sense that cyborg which mined ton of ore can check how much ore it mined)
2014-12-01 05:11:35 +01:00
682164335a
EMITTER MINING!
...
Yes! You can now mine using emitters. Each rock takes 3 blasts to break. This method will also yield less ore than other conventional methods. But using big lasers for mining is cool, right? Who cares about productivity.
2014-11-29 22:54:16 +01:00
4230a20c45
Merge pull request #6963 from mwerezak/sliceable
...
Rewrites food slicing, energy weapons
2014-11-08 11:07:34 +03:00
81f8f36874
Makes items used to slice food have the edge flag set, cleans up energy weapons, and adjusts slicable w_class.
2014-11-06 19:50:40 -05:00
bc438e21ad
All the relevant examine changes.
2014-11-05 12:44:23 +01:00
3839644bd8
Merge pull request #6651 from PsiOmegaDelta/PowerTwo
...
Ports /tg/'s cable and powernet code
2014-10-26 23:54:31 +03:00
8e3861141c
Merge branch 'dev' into PowerTwo
...
Conflicts:
code/modules/power/solar.dm
2014-10-24 13:32:36 +02:00
6eb19deef3
incorporates Zuhayr's suggestion
2014-10-22 23:21:01 -04:00
6ff6abf7b4
adds an ex_act to ore boxes. Explosions no longer del all the ore in a box
2014-10-22 16:58:44 -04:00
ca13d1d5d8
Fixes chem splicing, bioluminescence and seed packets for xenobotany.
2014-10-15 10:05:50 +10:30
a1ee4e766b
Basically ripped over /tg/'s powernet and cable code into our own codebase.
...
Keeps Z-level code as it was.
Modifies/restores powernet procs as necessary to match our own implementation changes.
2014-10-13 17:13:04 +02:00
0c83a95b90
Large merge resultion. Used remote for map conflicts.
2014-09-23 21:41:54 +09:30
c4e3c653cf
Fixes #6436
2014-09-18 13:12:36 +09:30
1eb759447e
Merge resolution, using dev-freeze map due to unreconcilable conflicts.
2014-09-13 16:54:48 +09:30
712e209ab6
Merge remote-tracking branch 'upstream/master' into dev
...
Conflicts:
code/__HELPERS/text.dm
code/game/machinery/podmen.dm
code/game/machinery/vending.dm
code/game/objects/items/candle.dm
code/game/objects/items/devices/PDA/cart.dm
code/modules/clothing/suits/jobs.dm
2014-09-10 22:14:37 +01:00
6d21c3193f
Trying to add to previous.
2014-09-10 21:16:06 +09:30
210930b2bb
Fixes most of #6300
2014-09-10 20:53:57 +09:30
505f857eb8
Stack update
2014-09-02 09:59:32 +04:00
58a750398e
Fixes 5866#
2014-09-01 23:20:46 +09:30
f5c9586153
Fixed matches and candles not being able to burn papers. Also made Diona join prompt appear for a bit longer.
2014-08-31 02:12:04 -07:00
a1348faa8c
Cables are now stacks
2014-08-25 18:54:35 +04:00
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
649af28c77
Fixed the overlay issue for now. This will need replacing.
2014-08-13 12:04:51 +09:30
54ec5f0233
Attempting to fix a very weird overlay error, refactoring some shit mining code.
2014-08-11 11:42:16 +09:30
e298b177db
Added flags for Mining and Xenoarch.
2014-08-01 22:40:48 +09:30
4ef8a08310
Added portable_atmospherics to hydroponics machine path, couple of other tweaks.
2014-07-27 03:20:16 +09:30
196fd07384
Resprited the majority of mining ores and turfs, added coal and plat to surface mining, add falloff for edges of asteroid.
2014-07-20 16:29:18 +09:30
bc2f91b4e4
Fixes #5608
2014-07-14 12:02:48 +09:30
5f8723352d
Merging robot_modules.dm and master controller setup.
2014-07-14 09:10:02 +09:30
Chinsky