Commit Graph

876 Commits

Author SHA1 Message Date
oranges c143e30ab5 Merge pull request #18350 from GunHog/AshTreaders
Mining Cyborg Ash Storm Plating Upgrade
2016-06-09 15:46:06 +12:00
oranges a08cff21f0 Merge pull request #18345 from TechnoAlchemisto/glass_bottles_don't_break_on_heads_as_easily_as_in_the_movies_I_would_know
Renames and relores loyalty implants to mindshield implants.
2016-06-09 15:39:53 +12:00
AnturK 05b9307a09 Merge pull request #18335 from Fox-McCloud/experimental
Experimentor Fixes
2016-06-08 13:14:57 +02:00
oranges c5a84c769d Merge pull request #18036 from AnturK/init_meme
Defers some list initializations
2016-06-08 19:20:04 +12:00
Core0verload 3af3bd2938 R&D machinery refactor (#18295)
* RnD machinery refactor

* Small changes

* Removed designs selling
2016-06-08 17:18:22 +12:00
GunHog 61b235d23c Merge remote-tracking branch 'remotes/upstream/master' into AshTreaders
# Conflicts:
#	code/modules/research/designs/mechfabricator_designs.dm
2016-06-07 18:37:38 -05:00
Joan Lung 61c2d6aee0 Merge pull request #18279 from GunHog/Mining_Borgs_Need_Love_Too
Mining Cyborg Hyper-Kenetic Accelerator Upgrade
2016-06-07 17:09:39 -04:00
AnturK 19eb97ae18 Moves some list initializations to New
Fixes missing ..() calls in New()
2016-06-07 18:39:13 +02:00
GunHog ff90dda131 Mining Cyborg Ash Storm Plating Upgrade
Adds an upgrade to Mining Borgies which will make them immune to ash
storms while looking TOTALLY AWESOME.
2016-06-07 11:25:19 -05:00
TechnoAlchemist 9287bd18a9 Ronald Reagan, the actor? 2016-06-07 05:06:15 -07:00
TechnoAlchemist 154982500b God is good. 2016-06-07 04:54:06 -07:00
LatD 25827d6ccb [Ready] Tweaks some R&D levels (#18246)
Removes tech levels from some traitor objectives. They had tech levels even before the remake but apparently now that the levels got raised that became a problem. Also some small tweaks to other items to make some early levels easier to get.
2016-06-07 20:18:19 +12:00
Fox-McCloud 4ce47d1a6f Experimentor Fixes 2016-06-07 02:10:44 -04:00
GunHog 80065468d4 Hyper KA for mining borgies <3
- Mining Cyborgs may now be upgraded with Hyper-Kenetic Accelerators
- Same cost and reqs as human version.
2016-06-05 11:57:39 -05:00
kevinz000 8b79a21698 why 2016-06-04 02:39:38 -07:00
kevinz000 4b2077fd6b fortheloveofallthatisholyworkplease 2016-06-04 02:30:38 -07:00
LatD ee7ef0d4d7 Fixes experimentor doing many reactions with one event (#18180)
* Fix many reactions happening at once

* Small fix
2016-06-03 18:00:15 -05:00
LatD 143795d230 Fixes imprinter alone not working (#18216) 2016-06-03 14:43:52 -05:00
Jordie 4c8f8ae53e Merge pull request #18154 from PKPenguin321/plant-analyzer-repath
Repaths plant analyzers
2016-06-03 16:41:02 +10:00
Razharas 9fdae2fe4e Merge pull request #17576 from LatD/Research
[Ready for test/merge] R&D level remake
2016-06-02 18:41:43 +03:00
PKPenguin321 cf71a5833f repaths plant analyzers
so they are no longer children of regular analyzers
2016-06-01 22:44:03 -07:00
Xhuis d7c09927fa Fixes an issue with golems and conversion 2016-05-29 03:43:39 -04:00
LatD a903b4cc79 merge conflicts? 2016-05-28 01:25:33 +03:00
LatD 67190cb762 Fixes things found in testing 2016-05-26 23:30:42 +03:00
coiax c1104797df Removes gatling gun from R&D (#17629)
This isn't even remotely balanced; at least xrays had a limited magazine
and needed recharging.

🆑 coiax
rscdel: Gatling gun removed from R&D for pressing ceremonial reasons.
/🆑
2016-05-26 14:50:16 -05:00
LatD ac11d35ea2 Bug and runtime fixes 2016-05-25 21:43:19 +03:00
LatD e7d5be221e Small fixes and changes 2016-05-24 23:04:00 +03:00
LatD 907fc36e5c Merge remote-tracking branch 'refs/remotes/tgstation/master' into Research 2016-05-24 22:17:44 +03:00
LatD 10a483d165 Stat logging for high R&D levels 2016-05-24 21:00:42 +03:00
AnturK 895406cd36 Merge pull request #17428 from Dahka/New_Syringes
Adds three new syringes
2016-05-24 17:37:40 +02:00
LatD 16cd4fbaa0 Exosuitfab origin and req lvls 2016-05-23 22:54:49 +03:00
LatD 6e6474ee9e Imprinter origin and req lvls 2016-05-22 23:46:05 +03:00
LatD 7d6b3e6847 origin and req lvl changes 2016-05-21 17:17:20 +03:00
c0 fb2a0961ff "Toolbox Arm" printable at exosuit fabricators and protolathes 2016-05-21 06:35:32 +03:00
LatD fe76e64641 Origin tech changes and some fixes 2016-05-17 20:57:01 +03:00
Joan Lung c79c7f0d86 Merge pull request #17619 from phil235/FixRnDThrow
Fix bundle. experimentor, rnd machines, mob throwing
2016-05-13 17:36:51 -04:00
phil235 487fb01366 Properly sever the link between rd computer and protolathe/circuit imprinter/destructive analyzer when the rd computer is screwdrived. 2016-05-13 22:23:16 +02:00
LatD bf3ef135ac Bugfixes and runtime fixes 2016-05-13 22:14:23 +03:00
LatD c401c8f522 Remove one slow step from DA 2016-05-13 18:50:22 +03:00
LatD 5a8f905b91 Efficiency coeff changes 2016-05-13 01:48:31 +03:00
phil235 a49e4cf87d Fixes experimentor having no sprite when panel open.
Fixes panel opening deconnecting the wrong rnd console
Fixes not being able to throw mobs.
2016-05-12 21:37:18 +02:00
TechnoAlchemist 4705efa6da Adds new items to the mining vendors. (#17362)
* Adds new items to the mining vendors, also adds tracking implanter since that didn't exist before.

* woops

* Fixes tracking implants for miners, makes medipens not OD you on tricord.

* Actually doesn't OD on tricord now

* Chemical changes.

* Upgraded the jaunter into the wormhole lifebelt

🆑 coiax
rscadd: The Free Golems have developed the jaunter into the  wormhole
lifebelt, which automatically teleports the user when they fall in a
chasm or suffer a major medical emergency. Must be worn on the belt to work.
/🆑

Please don't mistake a random teleportation in crit for saving a user's
life, the Supply channel gets a notification, but suit sensors are
required to find them, and there's no guarantee the location picked is
safe (for example, the Toxins Test Site is a valid jaunt destination,
along with in the middle of the slime cages in Xenobiology).

* Adds modification kit.

* Golem ship now has its own /area

And a bluespace beacon.

* 5 tick medijaunt, no radio, golem jaunters + areas

The number of ticks before a medical emergency jaunt happens is now
five. No radio message is produced.

Free Golems now have no restrictions on what they can purchase. Wormhole
jaunters now specifically drop golems near their ship.

* Modkits remove the race restrictions from KAs.

* Buffs buffs buffs

I'd say something, but I'm sure I'd regret it later.

* Advanced lifebelts, golem superiority

* Removes modkit from minervendors, adds modkit to RnD!

* COMPILE DAMN YOU!!

* I made it compile

* Honor to my country, not to you :(

* fuck

* h-haha?

* Kor you know I would never actually ban you

* i could personally care less for HBls adminning style
2016-05-11 22:19:47 -05:00
LatD 24419a7c96 Final reliabilities 2016-05-12 02:59:59 +03:00
LatD e685d82805 Removing reliability 2016-05-12 02:43:18 +03:00
LatD 61fcdfea00 Some initial changes 2016-05-11 20:20:13 +03:00
lordpidey 07daf80144 Xenobio slime console now gives error messages upon failure.
* Fixes #16998

* Changes spacing within output.
2016-05-10 09:44:34 -05:00
Dahka 91b3a03421 Add change suggested by RemieRichards, change research costs again. 2016-05-08 20:27:39 -03:00
Core0verload a66c2f4418 Machine/computer boards and frames refactor (#17300)
* Map Changes

* Machine/console boards and frames refactor

* More board changes
2016-05-08 12:11:18 +02:00
Dahka c35c3055a4 Increased syringes production and research cost 2016-05-06 13:37:16 -03:00
Dahka e9a74db93a adds piercing syringe and design to protolathe 2016-05-05 21:45:38 -03:00