Commit Graph

355 Commits

Author SHA1 Message Date
Cael_Aislinn
435ceda41f Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into xenoarch
Conflicts:
	maps/tgstation.2.1.0.0.1.dmm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-15 20:37:35 +10:00
Cael_Aislinn
74d0608278 made research shuttle consoles buildable, removed a debug thing for analysis machines
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-15 20:06:22 +10:00
Cael_Aislinn
1b0c83cb76 renamed a bunch of areas, naming tweaks elsewhere, added some custom mapplaced obj definitions
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-15 20:05:27 +10:00
Cael_Aislinn
d8fbd0b2cc tweaked some names
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-15 01:09:02 +10:00
Cael_Aislinn
3c745a1ee2 added some storage boxes + gearbelt
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-15 01:03:01 +10:00
Cael_Aislinn
bf216021fc added/cleaned up research outpost areas (inc iconstates), moved area definitions to separate file
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-15 01:02:23 +10:00
Chinsky
a2e2c373ef Added new item - nanopaste.
Researchable by RnD (materials and engineering tech), used to repair robots and robolimbs more efficiently (twice as fast and both damage types at once).
2013-03-13 05:57:53 +04:00
Cael_Aislinn
a1adddbce2 compile fix
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-11 00:12:33 +10:00
Cael_Aislinn
32184d8419 shuffled some sprites around, cleaned up some vars, added a new sprite for hyperspectral imager based on the book scanner
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-10 23:25:05 +10:00
Cael_Aislinn
4559bcce57 tewaked the noticeboard memos a bit, added 5 (verbose) manuals explaining how to do xenoarchaeology in character, added a bookcase for the manuals
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-10 22:57:08 +10:00
Cael_Aislinn
2401ac8185 more renames
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-10 19:06:29 +10:00
Cael_Aislinn
c79b0c1672 moved and renamed a bunch of files to be more consistent + intuitive
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-10 19:00:05 +10:00
Cael_Aislinn
67ecee35df renamed scanner to be more consistent, fixed a couple of issues with the anodevice local feedback on activate 2013-03-10 18:51:15 +10:00
Cael_Aislinn
2ef841da6e overhaul/cleanup to ano utilizers: they're now consistent with modern ss13 interactions + process more cleanly and operate more robustly, they properly interact with the rest of the updated xenoarch content, activating them should also give a message to anyone watching
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-10 18:43:41 +10:00
Cael_Aislinn
50f4d3a24d harvester overhaul to be cleaner + updated interaction and processing, should properly interact with the rest of the xenoarch update, draining charge is now done incrementally and procs the artifact effect on the harvester/anyone nearby
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-10 18:43:35 +10:00
Cael_Aislinn
ade8fcae22 effects will get a random id if the excavation code doesn't assign them one, cleaned up local activation feedback for effects
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-10 18:33:11 +10:00
Cael_Aislinn
28ab7d4e90 players touching an artifact with gloves will now receive a feedback message
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-10 18:32:06 +10:00
Cael_Aislinn
88c17b75b6 tweaks to artifact analysis including non-sfx vocal feedback, some cleanups to pre-scan checks
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-10 18:31:30 +10:00
Cael_Aislinn
fdcbebab93 tweaks and fixes to a bunch of artifact effects
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-10 18:21:45 +10:00
Cael_Aislinn
46761b14f8 fleshed out artifact analysis, added effect types to all the effects
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-10 14:55:04 +10:00
Cael_Aislinn
e27d7b2aeb cleanup for a bunch of stuff in arty scanners+harvesters, fix compile errors 2013-03-06 21:05:57 +10:00
Cael_Aislinn
dc794f5dac renamed a bunch of files to be a little more visible, added the beginnings of the new artifact scanners
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-03-06 20:50:17 +10:00
Cael_Aislinn
54fd829781 fixed chemical prep not working (runtime)
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-25 15:06:40 +10:00
Cael_Aislinn
46ecf43cf9 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into xenoarch
Conflicts:
	baystation12.dme
	code/WorkInProgress/Cael_Aislinn/ShieldGen/energy_field.dm
	icons/obj/device.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-25 14:40:46 +10:00
Cael_Aislinn
9b8387ac05 Merge branch 'master' of https://github.com/Baystation12/Baystation12 into xenoarch
Conflicts:
	baystation12.dme
	code/modules/reagents/Chemistry-Recipes.dm
	code/modules/research/xenoarchaeology/misc.dm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-25 14:27:44 +10:00
Cael_Aislinn
743e8f55dd fix for bones spawning weirdly
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-19 02:33:51 +10:00
Cael_Aislinn
7f4e52e299 replaced carrier reagents with existing chemical reagents
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-19 02:31:50 +10:00
Cael_Aislinn
ecb02a3acd reduced output message frequency for artifacts and analysis machinery, tweaked tools + finds, added storage item for excav picks
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-19 02:30:43 +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
31bf502e65 moved a file, add/tweaked some sprites
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-19 01:58:42 +10:00
Chinsky
a68e5d3875 Merge pull request #2333 from Baystation12/BEF-staging
Merge on the 16th if no issues
2013-02-17 04:44:25 -08:00
Zuhayr
6ad09d49c8 Fixes for posibrain name generation, research design for protolathe, possible for for double-say for posibrains (cannot test locally). 2013-02-16 14:21:00 -08: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
b9bd5ca3e2 renamed two files, restructured tools and anomaly suits to semi-final format
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-13 12:22:30 +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
f37c608dd1 restructured the layout of many files with folders + renames, added artifact types and artifact effects
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-12 22:53:55 +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
f6d3114d6e mice no longer have universal speak, carp and giant spiders will no longer carve through the station, removed unused item
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-09 01:13:30 +10:00
Cael_Aislinn
3c24a9088d tweaked fossils and arch. finds, added find -> reagent linking, added / tweaked linking between geosample + finds + reagents + analysis + turfs,
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-08 23:52:11 +10:00
Cael_Aislinn
09a340235c fixed processing + tweaked heat generation and function of analysis machinery, fixed up floodlight, added suspension (stasis) field generator
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-08 23:50:46 +10:00
Cael_Aislinn
9b802ce142 added + fleshed out + tweaked some misc items and excavation tools, renamed file 2013-02-08 23:49:38 +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
Cael_Aislinn
0efb0311e3 removed misc file, added some extra sprites, added/tweaked list helpers
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-04 23:37:50 +10:00
Cael_Aislinn
3f62e2a938 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into xenoarch
Conflicts:
	baystation12.dme
	code/modules/reagents/Chemistry-Holder.dm
	code/modules/reagents/Chemistry-Machinery.dm
	code/modules/research/xenoarchaeology/artifact_effect.dm
	code/modules/research/xenoarchaeology/finds.dm
	icons/obj/device.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-02-02 17:05:27 +10:00
Cael_Aislinn
7f05c6fdb3 Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport
Conflicts:
	baystation12.dme
	code/game/jobs/job/captain.dm
	code/game/jobs/job/security.dm
	code/modules/clothing/spacesuits/rig.dm
	code/modules/mob/living/carbon/human/hud.dm
	html/changelog.html
	icons/obj/items.dmi

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-01-23 01:02:27 +10:00
Cael_Aislinn
bb5a349fcf Merge branch 'incremental_tg' r5600 into bs12_with_tgport
Conflicts:
	baystation12.dme
	code/__HELPERS/global_lists.dm
	code/controllers/master_controller.dm
	code/game/gamemodes/events/ninja_equipment.dm
	code/game/gamemodes/events/space_ninja.dm
	code/game/gamemodes/wizard/rightandwrong.dm
	code/game/hud.dm
	code/game/jobs/job/captain.dm
	code/game/jobs/job/job.dm
	code/game/jobs/job/medical.dm
	code/game/jobs/job/science.dm
	code/game/jobs/job/security.dm
	code/game/machinery/computer/cloning.dm
	code/game/objects/items/blueprints.dm
	code/game/objects/items/weapons/gift_wrappaper.dm
	code/game/objects/items/weapons/implants/implantnanoaug.dm
	code/game/objects/items/weapons/storage/uplink_kits.dm
	code/game/objects/items/weapons/stunbaton.dm
	code/game/turfs/turf.dm
	code/modules/client/client defines.dm
	code/modules/client/client procs.dm
	code/modules/clothing/masks/miscellaneous.dm
	code/modules/clothing/shoes/miscellaneous.dm
	code/modules/clothing/under/ties.dm
	code/modules/mob/living/carbon/human/human_attackhand.dm
	code/modules/mob/living/carbon/human/life.dm
	code/modules/mob/living/carbon/human/say.dm
	code/modules/mob/living/silicon/say.dm
	code/modules/mob/mob_defines.dm
	code/modules/paperwork/clipboard.dm
	code/modules/paperwork/pen.dm
	code/modules/paperwork/stamps.dm
	code/modules/projectiles/projectile.dm
	code/modules/reagents/Chemistry-Holder.dm
	code/modules/reagents/reagent_containers/glass.dm
	code/setup.dm
	config/config.txt
	html/changelog.html
	icons/effects/effects.dmi
	icons/mob/feet.dmi
	icons/mob/head.dmi
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
	icons/mob/mask.dmi
	icons/mob/suit.dmi
	icons/mob/ties.dmi
	icons/mob/uniform.dmi
	icons/obj/clothing/hats.dmi
	icons/obj/clothing/masks.dmi
	icons/obj/clothing/shoes.dmi
	icons/obj/clothing/suits.dmi
	icons/obj/clothing/ties.dmi
	maps/tgstation.2.1.0.dmm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-01-23 00:23:37 +10:00
Cael_Aislinn
632cad1044 observers can become mice, strange ore can be picked up in ore boxes/satchels, crates and closets can be built out of plasteel, changelog update
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2013-01-21 18:47:03 +10:00
aranclanos@hotmail.com
569378878d Runtime fix for trying to build invalid objects and circuits on the protolathe and circuit imprinter, respectively.
git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5576 316c924e-a436-60f5-8080-3fe189b3f50e
2013-01-18 19:17:08 +00:00