Commit Graph

187 Commits

Author SHA1 Message Date
Kurfursten
f86b84c46a Fixes RMCE bugs 2015-04-27 03:42:11 -05:00
D3athrow
be4f5e76f2 Merge branch 'DeityLink-massdriver' into Bleeding-Edge 2015-04-23 19:41:27 -05:00
DeityLink
868b5eb782 The Mass Driver Update 2015-04-23 19:35:28 -05:00
Kurfursten
d466d1dd99 fixes stuff 2015-04-22 07:13:41 -05:00
dylanstrategie
ccadb78bc0 Fixes #3927
- Fix the Component Exchanger sharing its design ID with the Device
Analyzer, and thus making either unresearchable depending on which's
preresquite techs were hit first
- Up container from 10 to 20 components on request. That's a lot of
components, and of course you can carry a few filled gadget bags along
2015-04-16 09:01:29 +02:00
d3athrow
08ec822cf4 Merge pull request #3728 from dylanstrategie/Component-Exchanger
Add in a new Mechanic tool, the Rapid Machinery Component Exchanger
2015-04-14 11:40:50 -05:00
D3athrow
c3d0096c52 Fix lockboxes not showing (un)lockers 2015-04-10 15:52:10 -05:00
D3athrow
3ad70446b9 readd access requirements on lockboxes that were missing it. 2015-04-09 12:43:07 -05:00
dylanstrategie
23d1816753 Add in a new Mechanic tool, the Rapid Machinery Component Exhcanger
[Description pending]
2015-04-03 18:01:42 +02:00
DeityLink
6a58e87480 RnD designs 2015-04-01 09:10:56 +02:00
dylanstrategie
f37f906eef Fix #3525
- Add origin_tech to regular beakers (material 1, directly based on
similar value for glass sheets), add origin_tech corresponding to their
research techs to bluespace and statis beakers (both types). Vials
inherit beaker origin_tech
- Unfuck pathing in advanced beaker types, which forced me to modify the
abandoned_crates file (use an actual branch-off for large beakers)
- Actually use variable inheritance instead of repeating the same values
over and over
- Add logging for dousing shit with thermite
- Span, formatting, visible_message, newline, absolute pathing
- Remove commented vial definition duplicate
2015-03-23 01:40:01 +01:00
dylanstrategie
4bda233347 Con-Decon, fix some things
- Cell charger board can now be researched and used to build  machinery,
needs engi, power and materials
- Add explicit emag message
- Cell charger cover can be removed, add special skin
- Cell charger can be deconstructed
2015-03-10 19:06:34 +01:00
D3athrow
a144a3faad Reduce cost of conveyor circuit board, 200 glass and 5 acid now to fix #1637 2015-03-08 12:16:46 -05:00
d3athrow
c306b32f40 Merge pull request #3089 from Exxion/podfab
[BOX] Add R&D Console to Pod Bay-Necessary for podfab
2015-02-23 13:02:45 -06:00
D3athrow
853293cfef Fixes #3157 xenobotany machines are now constructable. 2015-02-21 14:31:38 -06:00
clusterfack
6d819c4863 Construction Update
IV drips toggle mode verb is now under object like it should be
Intercoms are now constructable and deconstructable
Light switches are now constructable and deconstructable
Cable coils has its own file under stack
Cyborg radio has its own file under radio
2015-02-21 07:44:47 -06:00
D3athrow
c0fdd5a297 Don't do it travis 2015-02-20 19:21:10 -06:00
D3athrow
a986996923 Fix path to circuit board, add as a research design. 2015-02-20 19:19:04 -06:00
Exxion
0b43431c4b Add pod R&D circuitboard to imprinter
Also fix the mechanic R&D board in the imprinter
2015-02-18 13:53:07 -05:00
ComicIronic
66dfd83c91 Commented out the design. 2015-02-16 23:12:43 +00:00
ComicIronic
b913808922 Machine-Man Interfaces
Act as a brain, let you make posibrains into humans (hopefully).g
2015-02-16 23:01:58 +00:00
ririchiyo
2184bab53b should fix some of the pod issues not showing up. 2015-02-09 12:10:54 -05:00
clusterfack
ce80acaac3 Fixes #2724, adds pill collector to medical crate. Fixes #2617, scrubs genetic defects from roundstart antagonists and new raging mages. Fixes #2817, upgrade modules are now under upgrade. Fixes #2807, stun arm should now spawn instead of toy sword. 2015-02-07 22:34:43 -06:00
d3athrow
31fade80a4 Merge pull request #2861 from SkowronX/GunSpritesNChanges
Inhand Gun Sprites + Extra Gun Changes
2015-02-07 15:49:41 -06:00
ririchiyo
fadbe87041 I ruin hopes and dreams, lets hope this works. 2015-02-07 16:13:12 -05:00
SkowronX
f821e8abde minor fixes 2015-02-07 13:36:41 -06:00
SkowronX
f67ae1986d Original commit 2015-02-07 13:28:53 -06:00
d3athrow
0958fa78f2 Merge pull request #2795 from clusterfack/smallbugfixes
Bugfixes
2015-02-05 20:05:46 -06:00
clusterfack
f7a33aee1b Fixes #2771, catwalks have deconstruction text. Fixes #2774, cyborg hud now has store button when opened. Also fixes some design datums that had identical ids and thus were not in the circuit imprinter menu. 2015-02-04 04:48:53 -06:00
Vas
1c90d318ec small typo fix 2015-02-02 22:22:24 +01:00
Vas
ad6fdbb945 New xenoarch drill 2015-02-02 08:08:29 +01:00
D3athrow
61144e0b67 name 2long 2015-01-30 17:37:24 -06:00
D3athrow
6ceaa6f4e8 make the mecha armor name a bit more obvious 2015-01-30 01:50:12 -06:00
d3athrow
f1644bb0af Runtime fixies 2015-01-29 18:44:36 -06:00
DeityLink
c15f26464b Merge branch 'Bleeding-Edge' into surgery-cleanup
Conflicts:
	code/game/objects/items/weapons/surgery_tools.dm
	code/modules/surgery/headreattach.dm
	code/modules/surgery/implant.dm
	code/modules/surgery/robolimbs.dm
2015-01-27 14:26:24 +01:00
Arthurdentist
7ce17036db added the EOD suit to research
Can now research the EOD suit and helmet
2015-01-25 18:21:54 +02:00
ririchiyo
2857e57ac2 Merge pull request #1869 from ComicIronic/BoardLock
Adds certain silicon boards to lockboxes
2015-01-17 18:28:19 -05:00
Unfit
927c8477fa Material synthesizers for engineering borgs 2015-01-04 15:44:54 +01:00
eswordthecat
9131429301 https://github.com/tgstation/-tg-station/pull/655 2014-12-28 08:13:48 +08:00
ComicIronic
096511b9db Merge conflicts. 2014-12-16 18:31:35 +00:00
ComicIronic
c9e270538f Mechanic fixes.
System now in place for machines having access requirements. Not yet used.
CE given special device analyzer in his locker.
Autolathes will now not eat the scanner and can be scanned by it.
2014-12-15 22:11:30 +00:00
DeityLink
25fe40c112 surgery clean up and laser scalpel fix 2014-12-14 23:41:55 +01:00
ComicIronic
b34aa27947 Merge remote-tracking branch 'origin/Bleeding-Edge' into MiningPicks 2014-12-14 17:40:43 +00:00
ComicIronic
7efc5b05d5 Mining code cleanup. 2014-12-14 17:40:31 +00:00
Rob Nelson
6f84caacca Constructable Prisms 2014-12-11 16:55:08 -08:00
DeityLink
6abe623659 Merge remote-tracking branch 'upstream/Bleeding-Edge' into Bleeding-Edge 2014-12-10 04:10:58 +01:00
ComicIronic
c9ed68c277 Made the Mecha recharge machines fully buildable. 2014-12-05 23:40:30 +00:00
DeityLink
d5a12c368d the PDA and Desk Bell update 2014-12-02 22:27:59 +01:00
ComicIronic
d437ae69ed Fix merge conflicts 2: merge more. 2014-11-30 22:02:47 +00:00
d3athrow
dc084129f8 Merge pull request #2016 from DeityLink/viromachines
Virology Machines now buildable/deconstructable
2014-11-30 10:46:21 -06:00