Commit Graph

104 Commits

Author SHA1 Message Date
Zuhayr
358867f3b5 Major sheet and material refactor. 2015-05-17 01:46:53 +09:30
Zuhayr
8aa24b86bb Renamed shards, katanas, claymores. 2015-05-16 20:36:33 +09:30
Zuhayr
3184f157e9 qdel 2015-05-12 13:12:58 +09:30
Zuhayr
bc50ba5166 Merge resolution. 2015-05-11 11:47:24 +09:30
PsiOmega
fe09ed1a22 Merge remote-tracking branch 'upstream/dev' into BorgModules
Conflicts:
	code/game/objects/items/robot/robot_upgrades.dm
	code/modules/mob/living/silicon/ai/subsystems.dm
	code/modules/mob/living/silicon/robot/robot.dm
	code/modules/mob/living/silicon/robot/robot_upgrades.dm
2015-04-26 15:52:18 +02:00
PsiOmega
e54fbcb9ec Cleans up borg module code and responsibilities. 2015-04-26 12:00:30 +02:00
Zuhayr
dbf8e53020 Mass rename of 'metal' to steel, refactor of walls and falsewall mineral construction, refactor of materials and ores. 2015-04-26 12:53:26 +09:30
Zuhayr
12cb60daa3 First pass on wall refactor/mining changes. 2015-04-26 12:53:03 +09:30
PsiOmega
1ae0ad6d92 Updates the atom_pool, now datum_pool, to handle any datum object.
Makes the garbage collector similarly robust. Continues the whole Destroy/qdel porting.
2015-04-24 09:59:05 +02:00
Zuhayr
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
Mloc-Argent
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
Atlantiscze
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
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
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
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
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
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
Zuhayr
78918e4795 Entirely removed the Honker mech, other refs to bananium, adamantine and mythril. 2014-06-08 00:52:20 +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
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
Mloc-Argent
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
Cael Aislinn
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
Ravensdale
a3e4a43536 Changes most viable, used entries of plasma with phoron. 2014-04-10 05:05:04 -07:00
Ravensdale
e6c3fbf071 Changes all appropriate instances of 'Plasma' to 'Phoron' 2014-04-10 01:19:49 -07:00
SkyMarshal
8885ad630e Fix for mining.
Fixes #4249
2014-01-09 17:26:13 -07:00
SkyMarshal
2308e71157 Mining fixes as it was annoying as fuck. Also a random object with nothing in it removed. 2014-01-08 21:33:17 -07:00
Zuhayr
37d96ebc80 Nerfs abandoned crates to be less fucking moronic. 2014-01-02 00:42:11 +10:30
Zuhayr
bda1297472 Merge branch 'master' of https://github.com/Zuhayr/Baystation12 2013-12-22 23:13:22 +10:30
Zuhayr
5b1bc6f8da Tentative fix for #4037, unable to reproduce runtime to check. 2013-12-19 22:13:48 +10:30
Iamgoofball
7fa80e799a made head PDA carts be in lockboxes. Added Abandoned Crates! 2013-11-20 14:57:22 -08:00
Cael Aislinn
4988c6f7e5 resolves issues with artifact location
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
2013-10-30 15:36:56 +10:00
Cael Aislinn
c419717255 tweaks and reworks much of xenoarch including new content and streamlining/cutting down on old content, removes much unused and old content, slight remap of research outpost (see changelog for more details)
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
2013-10-29 05:33:23 +10:00
Peter Wall
e716e66d10 Made mechas able to bump-mine 2013-07-25 15:40:03 +02:00
Cael Aislinn
6ccaae583f excavation gear belts can now hold pick sets, pick sets can no longer hold hand picks (they spawn in the locker instead), picks and measuring tapes now work much faster
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
2013-06-23 10:25:16 +10:00
Cael_Aislinn
6d03802c75 reduced the chance of safely extracting xenoarch finds without the proper process
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-05-14 13:08:30 +10:00
Cael_Aislinn
14bbdc91ca cleaned up artifact/find debris spawning, stopped debris being dropped for every asteroid turf, dropped machinery heat gain by 3/4
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-31 01:29:19 +10:00
Cael_Aislinn
398bdafbbd runtime fixes
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-18 12:01:43 +10:00
Cael_Aislinn
1322ac469c removed rock spawn for ordinary miners
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-10 23:49:50 +10:00
Cael_Aislinn
040cf2f8d5 tweaked artifact extraction, artifacts
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-19 02:27:46 +10:00
Cael_Aislinn
f0de14d0d4 fixed xenoarch chemical analysis, added icons for excavation picks, various misc tweaks
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-14 21:59:50 +10:00
Cael_Aislinn
7fba00ce55 miscellaneous fixes + tweaks + cleanups (spoons, artifacts, geotracking, helpers for finds, tools / gear)
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-14 13:28:31 +10:00
Cael_Aislinn
bbfbfb0ca2 tweaks to artifact spawning, tweaks and fixes to multiple anomalous artifact effects
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-13 12:23:20 +10:00
Cael_Aislinn
b63bc43820 new sprites, reworked digspite spawning and geosamples to fit artifacts, misc tweaks (admin logging on syndie beacon, energy field)
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-12 22:55:07 +10:00
Cael_Aislinn
b2e9c265c4 new icons, added some large artifacts, renamed/restructured a bunch of files
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-10 01:30:40 +10:00
Cael_Aislinn
5533ef4946 setup digsite creation + propogation on mining asteroid, setup most excavation and tool interaction with mining turfs + digsites, setup tweaked list operation, modified dme
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-08 23:54:45 +10:00
Cael_Aislinn
651fa7a9f0 restructured tools, restructured/added archaeo finds, restructured how finds spawn in the asteroid, tweaked some mining stuff
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-04 23:40:53 +10:00