3b61ba850f
Merge branch 'master' of git://github.com/Baystation12/Baystation12 into dev
...
Conflicts:
baystation12.dme
code/modules/projectiles/ammunition/bullets.dm
2013-09-02 23:32:33 +01:00
a084f74c7d
Expansion of every "icon = ''" path.
...
Supposed to help compilation times. Who knows.
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2013-09-01 21:53:36 +01:00
2304b743ce
Reagent scanner's addition.
2013-08-17 17:00:33 +03:00
0f0ac218b3
Commented out blob and wish granter.
2013-08-03 12:51:41 -07:00
914d072c86
Camera networks.
2013-07-28 00:58:18 +03:00
75c8f6d76a
Merge branch 'BEF-staging'
2013-07-08 23:28:22 +01:00
82c3e6aa8c
Fix for #3255 .
2013-07-06 16:51:59 +03:00
6804cf0518
Fix for #3254 .
2013-07-06 16:50:01 +03:00
08393161c0
Merge branch 'master' into BEF-staging
...
Conflicts:
config/config.txt
Signed-off-by: Mloc-Argent <colmohici@gmail.com >
2013-07-04 13:08:28 +01:00
4c1bb073ff
Fixes issue #2872 , partially. Carp are now smashed by shuttles if they don't get pushed out of the way. However, they can still end up in grille-windows, giving more motivation to replace them in shuttles with actual shuttle windows. Also gibs other simple_animal creatures that are in the way.
2013-07-04 04:55:24 -07:00
11e27c5999
Merge branch 'bleeding-edge-freeze' of github.com:Baystation12/Baystation12 into loops
...
Conflicts:
code/game/gamemodes/objective.dm
2013-07-01 19:49:29 +04:00
10ee1fbcfe
World loops 2: Electric Boogaloo.
2013-07-01 19:43:56 +04:00
8eec1d5379
Fixes #3008
2013-06-27 06:30:17 -07:00
de91fba835
halved the length of xenoarch scans, scans actually shut down when they exceed the safety by too much
...
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au >
2013-06-23 10:27:48 +10:00
73cf13745d
depth scanner should now properly show the responsive material of a find
...
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au >
2013-06-23 10:25:41 +10:00
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
360bde9f83
Fixed some typos. (feotal, "/red ...")
...
Signed-off-by: Furlucis <Logman115@gmail.com >
2013-06-11 15:01:48 -04:00
0b20496f7d
Adds Uranium Capability to Circuit Imprinters
...
Well, looking over the RUST circuits... They required uranium
which we didn't even have implemented in the code to work with
circuit imprinters. I considered simply changing them to use
a different resource, but it honestly makes more sense to improve
the current code to have it more versatile-- To this end, I've made
circuit imprinters capable of using uranium.
As a further note...
closes #2757
2013-06-10 00:12:28 -04:00
d7fb1f81ca
Fixed xenoarchaeology picksets not being able to hold everything they start with.
2013-05-28 19:58:42 -07:00
7067382f52
hardcapped xenoarch machinery heat to 177K, made xenoarch machinery only produce heat when scanning, added a couple of missing tools to the gearbelt
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-05-19 19:12:42 +10:00
23affb99bf
cleaned up some tools issues with w_class, depth scanners now reveal the reagent a find responds to (meaning lab analysis can be skipped)
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-05-14 13:09:48 +10:00
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
da9ad69983
made hyperspectral analysis images into a client-side resource
2013-05-14 13:07:11 +10:00
f021f69e9b
cleanup and standardisation of xenoarchaeology analysis machinery
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-05-14 13:06:29 +10:00
7312807346
Reverting the comment out on the sprites and added the correct path, the xenoarcheology.dmi
2013-05-05 21:21:09 -03:00
d762024d68
Fixed the server crash, it was an infinite loop when a revolver spawned in the xenoarcheology. It added bullets (tried, because it didn't work either) over and over nonstop.
...
Commented out the sprite selection on the revolvers in the xenoarcheology spawn code, it selected wrong names and they ended up being invisible. Now they will have the default sprite, the black revolver.
2013-05-05 21:12:15 -03:00
e4763aa928
Fixed #2708 .
2013-04-27 13:49:44 +04:00
bd0d988b23
Fix for Xenoarch machines producing ludicrous amounts of heat.
...
Defines may need tweaked to produce the desired effect.
2013-04-19 12:40:30 -07:00
2e0370ba65
Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bleeding-edge-freeze
...
Conflicts:
code/modules/research/xenoarchaeology/misc.dm
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-04-02 21:14:13 +10:00
964525450d
only hoverpods should make hissing noises when they move now
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-04-02 20:16:47 +10:00
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
76720abd6f
Merge branch 'BEF-staging' of github.com:Baystation12/Baystation12 into BEF-staging
2013-03-19 11:17:32 +04:00
4036ee3732
Fixed dem closets.
2013-03-18 18:37:57 +04:00
5e2c921933
Fixed nanopaste messages.
...
(and some my shitcode)
2013-03-18 18:01:51 +04:00
cad490c5f1
hand pick can fit into the excavation kit, made the xenoarch tool closet properly retain icon states
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-03-18 18:51:21 +10:00
00c915b16a
fixed size of 5/6 picks, fixed some of the field types for suspension gens
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-03-18 11:53:55 +10:00
e2058e57a4
added a new manual explaining suspension, tweaked a manual
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-03-18 11:52:07 +10:00
14a96f77ab
Merge pull request #2539 from comma/organ
...
Organ code restructuring
2013-03-16 07:10:40 -07:00
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
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
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
d8fbd0b2cc
tweaked some names
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-03-15 01:09:02 +10:00
3c745a1ee2
added some storage boxes + gearbelt
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-03-15 01:03:01 +10:00
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
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
a1adddbce2
compile fix
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-03-11 00:12:33 +10:00
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
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
2401ac8185
more renames
...
Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au >
2013-03-10 19:06:29 +10:00
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
Erthilo