Commit Graph

306 Commits

Author SHA1 Message Date
Ccomp5950 4cb9cd0911 Teleport bug fix
Since we're unable to reproduce this bug in a testing environment and I've already concluded this isn't a telescience bug then I am leaning more towards Xenoarchiology, specifically the artifacts.

This sanity check basically makes it where if there is an artifact on null terf or inside a container it won't process the effect.
If it's the teleport effect of artifacts that is causing this to happen and it's based on the item being in nullspace somehow then it should squash the bug.
Though the root of this is probably #4037 I cannot reproduce the runtime either.

So here goes, a stab in the dark.
2013-12-07 00:18:40 -06:00
Iamgoofball e02566fd2f Changes Telescience to Projectile Trajectory!
Conflicts:
	code/modules/telesci/gps.dm
	code/modules/telesci/telesci_computer.dm
2013-11-28 17:50:09 +04:00
Chinsky e3d19eceab Updated paths for smoke generator 2013-11-06 22:44:56 +04:00
Mloc-Argent f1b230edc4 Merge branch 'master' into dev 2013-11-04 10:46:13 +00:00
Iamgoofball 74b5a003cc Fixed Copypasta!
Fixed Copypasta!
2013-11-02 11:17:17 -07:00
Iamgoofball a75492d26b Startoad's plasma windows commit, I'm doing the github stuff for it.
https://github.com/StarToad/Baystation12/commit/3677121b51af852ed951c214c57a08fab60222c1
2013-11-01 18:53:45 -07: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 d19b9bc3b7 fixes the issue with coolant being ineffective
Signed-off-by: Cael Aislinn <cael_aislinn@yahoo.com.au>
2013-10-29 22:27:23 +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
Segrain 7ffafb657e Fix for acid pouring. 2013-10-27 21:56:08 +03:00
Iamgoofball cfbe1c6ad1 Added the Booze Dispenser, the Soda Dispenser, the Bluespace Beaker, and the Cryostasis Beaker. 2013-10-26 21:52:13 -07:00
Kilakk 91e440e26c Fixes #3801, C4 will no longer destroy the analyzer it's inside of
Committed to dev-freeze because the fix doesn't work with the click code on master
2013-10-27 00:42:11 -04:00
Mloc-Argent a1f55a50b1 Massive click code rework by SuperSayu, ported from TG.
Full details at https://github.com/tgstation/-tg-station/pull/1206
Fixes #3648

Hopefully done right this time.

Signed-off-by: Mloc-Argent <colmohici@gmail.com>
2013-10-08 20:27:39 +01:00
Erthilo 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
Mloc-Argent 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
Segrain 2304b743ce Reagent scanner's addition. 2013-08-17 17:00:33 +03:00
Zuhayr 0f0ac218b3 Commented out blob and wish granter. 2013-08-03 12:51:41 -07:00
Segrain 914d072c86 Camera networks. 2013-07-28 00:58:18 +03:00
Mloc-Argent 75c8f6d76a Merge branch 'BEF-staging' 2013-07-08 23:28:22 +01:00
Segrain 82c3e6aa8c Fix for #3255. 2013-07-06 16:51:59 +03:00
Segrain 6804cf0518 Fix for #3254. 2013-07-06 16:50:01 +03:00
Mloc-Argent 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
Ispil 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
Spamcat 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
Spamcat 10ee1fbcfe World loops 2: Electric Boogaloo. 2013-07-01 19:43:56 +04:00
Zuhayr 8eec1d5379 Fixes #3008 2013-06-27 06:30:17 -07:00
Cael Aislinn 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
Cael Aislinn 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
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
Furlucis 360bde9f83 Fixed some typos. (feotal, "/red ...")
Signed-off-by: Furlucis <Logman115@gmail.com>
2013-06-11 15:01:48 -04:00
NicholasDV 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
VitrescentTortoise d7fb1f81ca Fixed xenoarchaeology picksets not being able to hold everything they start with. 2013-05-28 19:58:42 -07:00
Cael_Aislinn 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
Cael_Aislinn 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
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 da9ad69983 made hyperspectral analysis images into a client-side resource 2013-05-14 13:07:11 +10:00
Cael_Aislinn 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
Aranclanos 7312807346 Reverting the comment out on the sprites and added the correct path, the xenoarcheology.dmi 2013-05-05 21:21:09 -03:00
Aranclanos 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
Spamcat e4763aa928 Fixed #2708. 2013-04-27 13:49:44 +04:00
SkyMarshal 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
Cael_Aislinn 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
Cael_Aislinn 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
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
Spamcat 76720abd6f Merge branch 'BEF-staging' of github.com:Baystation12/Baystation12 into BEF-staging 2013-03-19 11:17:32 +04:00
Spamcat 4036ee3732 Fixed dem closets. 2013-03-18 18:37:57 +04:00
Spamcat 5e2c921933 Fixed nanopaste messages.
(and some my shitcode)
2013-03-18 18:01:51 +04:00
Cael_Aislinn 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
Cael_Aislinn 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
Cael_Aislinn 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