Graham Lloyd
6eb19deef3
incorporates Zuhayr's suggestion
2014-10-22 23:21:01 -04:00
Graham Lloyd
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
Zuhayr
ca13d1d5d8
Fixes chem splicing, bioluminescence and seed packets for xenobotany.
2014-10-15 10:05:50 +10:30
Zuhayr
0c83a95b90
Large merge resultion. Used remote for map conflicts.
2014-09-23 21:41:54 +09:30
Zuhayr
c4e3c653cf
Fixes #6436
2014-09-18 13:12:36 +09:30
Zuhayr
1eb759447e
Merge resolution, using dev-freeze map due to unreconcilable conflicts.
2014-09-13 16:54:48 +09:30
Mloc-Argent
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
Zuhayr
6d21c3193f
Trying to add to previous.
2014-09-10 21:16:06 +09:30
Zuhayr
210930b2bb
Fixes most of #6300
2014-09-10 20:53:57 +09:30
Kelenius
505f857eb8
Stack update
2014-09-02 09:59:32 +04:00
Zuhayr
58a750398e
Fixes 5866#
2014-09-01 23:20:46 +09:30
Whitellama
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
Kelenius
a1348faa8c
Cables are now stacks
2014-08-25 18:54:35 +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
Zuhayr
649af28c77
Fixed the overlay issue for now. This will need replacing.
2014-08-13 12:04:51 +09:30
Zuhayr
54ec5f0233
Attempting to fix a very weird overlay error, refactoring some shit mining code.
2014-08-11 11:42:16 +09:30
Zuhayr
e298b177db
Added flags for Mining and Xenoarch.
2014-08-01 22:40:48 +09:30
Zuhayr
4ef8a08310
Added portable_atmospherics to hydroponics machine path, couple of other tweaks.
2014-07-27 03:20:16 +09:30
Zuhayr
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
Zuhayr
bc2f91b4e4
Fixes #5608
2014-07-14 12:02:48 +09:30
Zuhayr
5f8723352d
Merging robot_modules.dm and master controller setup.
2014-07-14 09:10:02 +09:30
Zuhayr
85b1bbe041
Merging work into dev.
2014-07-10 20:25:07 +09:30
Zuhayr
d5784c653c
Reapplied scanners to map, stopped braces working on drill turfs with no resources.
2014-07-10 20:13:59 +09:30
Zuhayr
5ace6d3bc0
Mining rework. Added ore scanner, adjusted values for spawn, added debug verbs.
2014-07-09 19:12:32 +09:30
Zuhayr
b690f927ba
Fixes #5472
2014-07-03 05:20:29 +09:30
Zuhayr
19bb5014a9
More work on custom gear.
2014-06-29 04:22:09 +09:30
Zuhayr
9638349fe2
Update distribution.dm
2014-06-25 16:48:20 +09:30
Zuhayr
89a450c4f4
Mining tweaks, removal of debug/cruft, balancing of values.
2014-06-25 16:25:15 +09:30
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
Chinsky
f7e14c8f99
Merge pull request #5282 from Jarcolr/master
...
Partially fixes #5255 and walking over asteroid edges
2014-06-19 17:03:06 +04:00
Cael Aislinn
0e1c367012
reconstitutor has a chance to extract multiple genomes per fossil (50% for two genomes, 37.5% chance for three genomes), moved xenoarchaeology initialisation code into the master controller, added upper and lower spawn vals for digsite turf number and artifact machine number, added circuitboards for the reconstitutors, fixes missing clonepod for flora reconstitutors
...
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au >
2014-06-19 11:06:20 +10:00
Cael Aislinn
6c46ceaf6d
Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into xenoarchaeology
...
Conflicts:
icons/obj/hydroponics.dmi
manual merge of conflicted icon file
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au >
2014-06-19 10:05:27 +10:00
Jarcolr
fc4c918eda
Fixes #5255 and walking over edges
...
Before walking over an asteroid edge would have put the mob under the
sprite, as if the mob crawled under it.
2014-06-17 20:09:19 +03:00
Chinsky
be95e54e43
Merge branch 'master' into dev
...
Conflicts:
code/defines/obj/weapon.dm
code/modules/mob/living/carbon/species.dm
code/modules/mob/living/silicon/say.dm
icons/mob/uniform.dmi
maps/tgstation2.dmm
2014-06-17 16:16:44 +04:00
mwerezak
6dee9cf65d
Adds sharp and edge flags to appropriate items
...
Went through as many /obj/item/weapons as I could find and added sharp
and edge flags where appropriate.
2014-06-16 13:26:44 -04:00
Zuhayr
c841db56b6
Merge branch 'mining' of https://github.com/Zuhayr/Baystation12 into dev
2014-06-11 09:24:28 +09:30
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
Zuhayr
c3c6f72147
More changes. Added uses for tritium, m.hydrogen and platinum. Increased cargo price for phoron.
2014-06-08 01:39:49 +09:30
Zuhayr
78918e4795
Entirely removed the Honker mech, other refs to bananium, adamantine and mythril.
2014-06-08 00:52:20 +09:30
Zuhayr
c2f2a7cde6
Refactored material definitions a little bit, removed all bananium from the codebase.
2014-06-08 00:40:34 +09:30
Zuhayr
a026575ef7
Ironed out some bugs. Everything should be working for testing purposes.
2014-06-08 00:04:58 +09:30
Zuhayr
95a6f9d613
First pass on ore distribution map and stationary drilling rig.
...
Added sprites for stationary drilling gear.
Added skeleton ores for coal, adamantine, mythril. Updated some icons. Expanded mining rig functionality.
Changed adamantine and mythril to osmium and metallic hydrogen.
Added ore distribution map generation to master controller.
Added upgrading to stationary drills, tweaked other stuff.
Rewriting the ore processor and how ores handle information. Also rewrote the ore stacker.
2014-06-07 23:07:49 +09:30
Zuhayr
00c81bb675
Moved engineering, research and mining shuttles to a generalized system with its own directory structure.
2014-06-03 15:26:34 +09:30
Zuhayr
1e135f91af
Merge resolution with master.
2014-06-02 12:05:12 +09:30
Mloc-Argent
ee2e68960a
Merge remote-tracking branch 'upstream/master' into dev-freeze
...
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
Conflicts:
code/game/machinery/cloning.dm
code/modules/admin/admin_verbs.dm
2014-05-31 00:17:56 +01:00
Loganbacca
fadf56b5fc
Ore box verb tweaks
...
- Added more sanity checks
- Added more user feedback
2014-05-25 12:20:54 +12:00
Loganbacca
e09740b089
Ore box verbs
...
- Added custom examine verb
- Added empty ore box
- Removed browse interface
2014-05-24 14:14:04 +12:00
mwerezak
637f7193fc
Fixes circuit var for other consoles
...
Also cleans up attackby while we're at it.
2014-05-22 18:05:57 -04:00
Mloc-Hibernia
e3a8d5eb43
Merge remote-tracking branch 'upstream/master' into dev
...
Signed-off-by: Mloc-Hibernia <colmohici@gmail.com >
Conflicts:
code/game/objects/effects/spawners/bombspawner.dm
2014-05-11 13:19:09 +00:00
Chinsky
963216b43b
Merge pull request #4952 from Mloc/bs12-mineturfs
...
mining: fix for mining cooling down
2014-05-11 01:47:30 +04:00
