Commit Graph

117 Commits

Author SHA1 Message Date
Cael_Aislinn
c5d598596e moved reagents and recipes purely used for xenoarch to a new file, forgot to commit some icons, tweaks to a bunch of xenoarch stuff
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-08-11 20:27:30 +10:00
Cael_Aislinn
626c782ff2 new xenoarchaeology tools, basic datum for xenoarch work (WIP stuff)
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-08-11 02:37:01 +10:00
Cael_Aislinn
c6cef3ea98 moved and tweaked the xenoarch finds a bit
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-08-11 02:17:07 +10:00
Cael_Aislinn
1bd9e86b84 added chemistry cooker (bunsen burner) and the capacity for recipes that require heating
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-08-11 02:16:04 +10:00
comma
138e41dd54 Merge branch 'master' of https://github.com/Baystation12/Baystation12
Conflicts:
	code/game/objects/items/weapons/surgery_tools.dm

Did not do a pull in ages, all constants I sued in surgery code got renamed.
2012-08-08 13:21:47 +04:00
comma
c9785bbeff Cannot weld strange rocks with unlit welder anymore.
Fixes issue #1454
2012-08-06 19:34:59 +04:00
Cael_Aislinn
3e6f253cb7 various tweaks to energy fields, energy field artifacts (some outstanding bugs still)
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-08-06 05:13:02 +10:00
Cael_Aislinn
f250b8de1b added blue tiled floors to medbay lobby, added purple tiles to areas of research and the hallway adjoining research, remapped the anomaly hallway and research dock, remapped the research outpost dock, added todo note for a future cycling airlock update
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-07-25 02:15:47 +10:00
Albert Iordache
cfabe7be97 Re-added deletion logging 2012-07-23 10:31:14 +03:00
Albert Iordache
4b350214a9 Fixed two runtimes errors (AI eye and artifacts) 2012-07-15 12:50:27 +03:00
Albert Iordache
dd6c41ade1 Merge branch 'master' of github.com:Baystation12/Baystation12
Conflicts:
	code/modules/research/xenoarchaeology/artifact_effect.dm
2012-07-13 20:58:48 +03:00
Albert Iordache
dda09390ac Merging pull request from caelaislinn-master 2012-07-13 20:54:22 +03:00
Albert Iordache
05851aa0e4 Quick fix to avoid artifact runtime error spam 2012-07-12 15:57:53 +03:00
Albert Iordache
1faea6c508 Removed the artifact stun effect 2012-07-10 09:37:59 +03:00
caelaislinn
4100df644d crystals shouldn't spam as much
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
2012-07-08 20:23:07 +10:00
caelaislinn
cf7dd519e5 archaeo item updates/additions, map fixes, fix for ore box icon
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
2012-07-07 09:00:37 +10:00
caelaislinn
613c9457ed shielding circuitboards should be buildable now
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
2012-07-06 11:17:58 +10:00
caelaislinn
6d51e57702 artifact files moved to new folder to avoid clutter, mining north outpost repurposed as research outpost, shuttle dock added to research wing (both shuttle dock and outpost require standard research access), modified layout of the anomaly lab slightly 2012-07-05 23:47:35 +10:00
caelaislinn
564390774f fix for "Energy radiating from the /datum/artifact_effect"
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
2012-06-25 22:49:47 +10:00
caelaislinn
7bd5beeb17 anomlies now have an activated and non-activated sprite
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
2012-06-25 09:26:50 +10:00
caelaislinn
00493873c0 artifacts have a disable message
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
2012-06-25 09:03:39 +10:00
caelaislinn
f131543fb7 fix for never closing bug
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
2012-06-25 08:55:28 +10:00
caelaislinn
beb863020b more tweaks and fixes
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
2012-06-25 08:50:03 +10:00
caelaislinn
ddda9f2ce3 fixes and tweaks for the harvester
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
2012-06-25 08:35:19 +10:00
caelaislinn
137e15ef62 this should fix the power harvester bug
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
2012-06-25 07:59:08 +10:00
Albert Iordache
156f1349c2 Fixed compilation error and moved acid_act() 2012-06-24 19:13:51 +03:00
caelaislinn
a240dc71ba added acid_act() proc, works similarly to proc on luna code, fixed some anomaly bugs
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
2012-06-25 01:48:55 +10:00
caelaislinn
2237e3f658 talking crystal can be heard with ghost ears
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
2012-06-24 19:58:21 +10:00
caelaislinn
37e76d7436 artifact machinery now uses power
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
2012-06-24 11:57:32 +10:00
caelaislinn
639c00fb66 fix for "the floor emits a pulse of energy"
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
2012-06-24 11:45:51 +10:00
SkyMarshal
62c3d1d11d De-retarded wound system. 2012-06-23 16:35:58 -07:00
Erthilo
4f4ebd809d TG: Comitting for Giacom.
Details here: http://nanotrasen.com/phpBB3/viewtopic.php?f=16&t=8960

And, to summarise:
Added a new computer, the message monitor console. It is able to access the logs
on the message server.
Made PDAs dependant on the message server instead of Telecomms. This fixes PDAs
not sending any messages due to no listening_freqs.

When paper is splashed with Ethanol, the contents of the paper or book
disappear.
Added white coloured pens. Allows you to write hidden messages that can be
revealed by highlighting the text.
Revision: r3777
Author: 	 petethegoat
2012-06-23 16:42:37 +01:00
Erthilo
13aa7558a6 TG: Fixes a pesky compile error in my last commit.
Revision: r3756
Author: 	 vageyenaman
2012-06-23 15:10:49 +01:00
caelaislinn
97f8bcffff prevent an artifact from being analysed and harvested at the same time
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
2012-06-23 16:51:51 +10:00
caelaislinn
c282fbe866 correctly choose random dir on rebound
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
2012-06-23 16:24:37 +10:00
caelaislinn
0b38e9f13c crystal / beam collision tweaks
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
2012-06-23 15:24:25 +10:00
caelaislinn
fda643647a removed New() debug message
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
2012-06-23 15:19:55 +10:00
caelaislinn
b7e22da1d5 more artifact tweaks
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
2012-06-23 15:18:26 +10:00
caelaislinn
66769fec4f arty tweaks
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
2012-06-23 14:49:22 +10:00
caelaislinn
0e21ed125a artifacts can be harvested and reused in a portable emitter, restructured artifacts, artifact analyses should go a lot smoother and faster now, additional bugfixes in general, moves some icons around to hopefully fix some bugs, additional strange rock formations should spawn now, dbs should work now, reworked the anomaly lab, redacted
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
2012-06-23 04:16:09 +10:00
Cael_Aislinn
81714b9b0b more arty tweaks
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-06-23 01:42:36 +10:00
Cael_Aislinn
952f240d4e fix for unable to find pad >.>
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-06-23 01:32:30 +10:00
Cael_Aislinn
835b1f2567 some more fixes
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-06-23 01:17:21 +10:00
Cael_Aislinn
6b61a58d2d fixes for (hopefully) some of the bugs that came up over the last few rounds
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2012-06-23 00:59:27 +10:00
caelaislinn
d5821ddb99 artifact tweaks, added artifact catalogue database to anom lab
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
2012-06-22 16:31:43 +10:00
caelaislinn
b79d5253b0 gloves now prevent on-touch artifacts from activating, anomaly suits are pressure resistant, fixed door in anom lab
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
2012-06-22 16:09:09 +10:00
caelaislinn
3210012cf9 slight artifact tweaks
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
2012-06-22 14:31:15 +10:00
caelaislinn
c6ae41d7dc slight bugfixes
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
2012-06-22 07:26:14 +10:00
caelaislinn
124a511de1 Merge branch 'master' of https://github.com/Baystation12/Baystation12 2012-06-22 07:16:43 +10:00
caelaislinn
854ca4c516 ported much of alfie's anomaly code from luna, cut down and bugfixed much of said code, added new findable artifacts, tweaked existing artifacts, added anomalous artifact analysis (more to come later, possibly)
Signed-off-by: caelaislinn <cael_aislinn@yahoo.com.au>
2012-06-22 07:02:56 +10:00