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
85b1bbe041
Merging work into dev.
2014-07-10 20:25:07 +09:30
d5784c653c
Reapplied scanners to map, stopped braces working on drill turfs with no resources.
2014-07-10 20:13:59 +09:30
5ace6d3bc0
Mining rework. Added ore scanner, adjusted values for spawn, added debug verbs.
2014-07-09 19:12:32 +09:30
b690f927ba
Fixes #5472
2014-07-03 05:20:29 +09:30
19bb5014a9
More work on custom gear.
2014-06-29 04:22:09 +09:30
9638349fe2
Update distribution.dm
2014-06-25 16:48:20 +09:30
89a450c4f4
Mining tweaks, removal of debug/cruft, balancing of values.
2014-06-25 16:25:15 +09:30
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
f7e14c8f99
Merge pull request #5282 from Jarcolr/master
...
Partially fixes #5255 and walking over asteroid edges
2014-06-19 17:03:06 +04:00
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
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
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
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
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
c841db56b6
Merge branch 'mining' of https://github.com/Zuhayr/Baystation12 into dev
2014-06-11 09:24:28 +09:30
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
c3c6f72147
More changes. Added uses for tritium, m.hydrogen and platinum. Increased cargo price for phoron.
2014-06-08 01:39:49 +09:30
78918e4795
Entirely removed the Honker mech, other refs to bananium, adamantine and mythril.
2014-06-08 00:52:20 +09:30
c2f2a7cde6
Refactored material definitions a little bit, removed all bananium from the codebase.
2014-06-08 00:40:34 +09:30
a026575ef7
Ironed out some bugs. Everything should be working for testing purposes.
2014-06-08 00:04:58 +09:30
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
00c81bb675
Moved engineering, research and mining shuttles to a generalized system with its own directory structure.
2014-06-03 15:26:34 +09:30
1e135f91af
Merge resolution with master.
2014-06-02 12:05:12 +09:30
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
fadf56b5fc
Ore box verb tweaks
...
- Added more sanity checks
- Added more user feedback
2014-05-25 12:20:54 +12:00
e09740b089
Ore box verbs
...
- Added custom examine verb
- Added empty ore box
- Removed browse interface
2014-05-24 14:14:04 +12:00
637f7193fc
Fixes circuit var for other consoles
...
Also cleans up attackby while we're at it.
2014-05-22 18:05:57 -04:00
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
963216b43b
Merge pull request #4952 from Mloc/bs12-mineturfs
...
mining: fix for mining cooling down
2014-05-11 01:47:30 +04:00
b3af8e8936
Ore duplication bug fix
...
Fixes #4951
2014-05-10 14:32:08 +12:00
0911bbd0e7
mining: fix for mining cooling down
...
Hacky thing that was already done to space. TCMB->T0C
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2014-05-09 22:47:55 +01:00
e1ddec4a73
Merge remote-tracking branch 'upstream/master' into dev
...
Conflicts:
code/game/area/Space Station 13 areas.dm
code/game/objects/items/weapons/manuals.dm
code/modules/mob/living/say.dm
code/modules/organs/organ_internal.dm
code/modules/paperwork/paper.dm
code/modules/supermatter/supermatter.dm
html/changelog.html
icons/mob/uniform.dmi
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2014-05-03 16:56:19 +01:00
18c8e9f8f1
adds new feature: cloning extinct animals and seeds from fossils found through xenoarchaeology, some minor tweaks to various other areas to make it work
...
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au >
2014-05-03 18:30:52 +10:00
68eda5201b
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into phoron
...
Conflicts:
code/ATMOSPHERICS/components/unary/vent_scrubber.dm
code/modules/paperwork/paper.dm
html/changelog.html
icons/mob/uniform.dmi
maps/tgstation2.dmm
2014-04-16 21:44:26 -07:00
efcad9f527
Removal of Telescience.
2014-04-16 20:23:56 -07:00
a3e4a43536
Changes most viable, used entries of plasma with phoron.
2014-04-10 05:05:04 -07:00
e6c3fbf071
Changes all appropriate instances of 'Plasma' to 'Phoron'
2014-04-10 01:19:49 -07:00
0d589ff569
Changes all instances of PLASMA in active code into PHORON
2014-04-10 00:19:29 -07:00
06fd99b9ba
Merge pull request #4723 from Jarcolr/diction
...
Fixes some typos and descriptions
2014-04-09 21:48:19 +04:00
868dea5681
Grammar patch 1
...
This is just the first one of many.
2014-04-08 14:48:31 +03:00
98fba3b6b0
Merge branch 'master' of github.com:Baystation12/Baystation12 into dev
...
Conflicts:
code/modules/mining/machine_processing.dm
code/modules/mob/living/carbon/human/life.dm
code/modules/mob/living/silicon/ai/ai.dm
code/modules/virus2/helpers.dm
2014-03-18 19:44:19 -05:00
ddb414d740
Removal of plasma glass
2014-03-17 20:37:10 +01:00
83d028e394
Merge pull request #4588 from Ccomp5950/ore_process_optimize
...
Code effeciency project: Ore processing.
2014-03-17 19:14:20 +00:00
7ce4073135
Code effeciency project: Ore processing.
...
Before: The stacker and processor used del(item) to get rid of the items causing /obj/movable/del() to spike up and cause fun amounts of lag. Also we have seperate variables for if a certain ore type is selected in the processing machine and the cooking portion of process() uses a huge string of if()'s which check 8 or so variables and is terrible and probably a pain in the ass should someone decide to later add ore types and recipes.
After: We just set item.loc = null when it goes in the stacker of processor and garbage collection takes care of it within a tick. Those different variables for ore selection are now just one variable which is a bitfield, much easier to read, much easier to expand upon.
2014-03-15 04:05:56 -05:00
53d0fac4e3
Small tweak to coin flipping.
...
Last one,I swear.
2014-03-14 18:39:22 +02:00
c8c7ea34e9
Forgot var/sides = 2
...
Oops.
2014-03-13 19:33:54 +02:00
51177f2663
You can now flip coins,AKA the D2
2014-03-13 18:56:01 +02:00
1f7a444ab1
Fixed plasma glass outputting slag
...
Fixes #4560
Code was missing continue statements.
2014-03-12 13:15:23 +13:00
Zuhayr