kevinz000
8b79a21698
why
2016-06-04 02:39:38 -07:00
kevinz000
4b2077fd6b
fortheloveofallthatisholyworkplease
2016-06-04 02:30:38 -07:00
Jordie
4c8f8ae53e
Merge pull request #18154 from PKPenguin321/plant-analyzer-repath
...
Repaths plant analyzers
2016-06-03 16:41:02 +10:00
PKPenguin321
cf71a5833f
repaths plant analyzers
...
so they are no longer children of regular analyzers
2016-06-01 22:44:03 -07: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
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
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
LatD
e685d82805
Removing reliability
2016-05-12 02:43:18 +03: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
phil235
524a55a757
Merge branch 'master' of https://github.com/tgstation/-tg-station into Dismemberment
...
Conflicts:
code/datums/martial.dm
code/game/gamemodes/changeling/powers/fleshmend.dm
code/modules/mob/living/carbon/carbon.dm
2016-05-05 21:57:10 +02:00
phil235
68da092009
Dismemberment port from Hippie code, based on RemieRichard's work. Big thanks to RemieRichards and crystalwarrior.
2016-05-05 18:17:51 +02:00
c0
19af2d58d5
Removes "Exosuit Module" from mecha board design names
2016-04-30 10:20:25 +03:00
KorPhaeron
25875cda18
Removes commented out recipes
2016-04-23 14:09:45 -05:00
KorPhaeron
ad4782ac41
Tesla Revolver
2016-04-23 13:55:03 -05:00
KorPhaeron
3e3001acb2
Merge remote-tracking branch 'refs/remotes/tgstation/master' into USA
2016-04-22 12:21:14 -05:00
KorPhaeron
a78ce8712e
Gatling Gun icon fixes
2016-04-21 20:59:07 -05:00
KorPhaeron
00c5b0bed3
Nuclear Gun cost revert
2016-04-21 20:29:00 -05:00
KorPhaeron
5a813a96a5
Gatling Laser
2016-04-21 20:26:13 -05:00
Cheridan
cc313310d9
Merge pull request #16985 from Core0verload/mecha-plasma-cutter
...
Fixes Mecha Plasma Cutter design
2016-04-20 12:00:55 -05:00
KorPhaeron
bd5eb1d02b
Merge pull request #16958 from erwgd/AutolatheMakeMilbelts
...
Adds tray to autolathe designs
2016-04-19 16:05:28 -05:00
c0
ba91db5e0c
Mecha Plasma Cutter
2016-04-19 15:58:25 +03:00
KorPhaeron
3527347160
Shock Revolver
2016-04-18 21:29:43 -05:00
erwgd
23700e33ff
Added tray datum to autolathe_designs.dm
2016-04-18 10:43:26 +01:00
Cheridan
d671bf573c
Merge pull request #16858 from nullbear/Chemical-Explosives
...
Adds Chemical Explosives
2016-04-18 02:35:56 -05:00
Cheridan
2f52e7daf9
Merge pull request #16829 from erwgd/LetUsMakeDinnerware
...
New autolathe category for kitchen+bar items
2016-04-14 11:56:21 -05:00
erwgd
9d6247c890
Removed bowl making code from biogenerator.dm
...
Added bowl design to autolathe_designs.dm
Changed bowl materials to 500 glass
2016-04-14 17:14:01 +01:00
Joan Lung
d8a724f1c4
Merge pull request #16806 from coiax/airlock-painter
...
Airlock painter now printable in autolathe; plus meme suicides
2016-04-14 09:29:10 -04:00
nullbear
df32979866
Adds Chemical Explosives
...
see changelog for details
2016-04-13 13:09:41 -07:00
erwgd
ca88d3f025
added shot glass and shaker designs to autolathe
...
defined materials for shot glass and shaker
2016-04-13 17:17:15 +01:00
KorPhaeron
62939a09f0
Merge pull request #16733 from octareenroon91/patch-35
...
Add Drone Shell to Protolathe for ease of exporting drone data disks to autolathes
2016-04-12 23:54:47 -05:00
erwgd
0078f91d8a
Added hacked autolathe design for butcher cleaver
...
Defined materials for butcher cleaver
2016-04-12 20:01:26 +01:00
erwgd
f0a6af827e
Added bowl design to biogenerator.dm
...
Added recipes for fork and drinking glass to autolathe_designs.dm
Defined materials for fork, bowl, drinking glass
2016-04-12 19:39:09 +01:00
erwgd
73be1a80c0
Created Dinnerware category for autolathe
...
Changed category of kitchen knife from "Misc." to "Dinnerware"
2016-04-11 22:19:15 +01:00
Jack Edge
115d32a357
Adds airlock painter to autolathe designs
2016-04-11 11:54:45 +01:00
KorPhaeron
82786783f4
Merge pull request #16716 from coiax/plant-genes
...
Added a "plant DNA manipulator" to Botany backroom
2016-04-08 16:34:34 -05:00
Jack Edge
0465ea35f8
Fixed inaccurate description of design item
2016-04-08 22:25:05 +01:00
Jack Edge
452577a9dd
Added plant DNA circuit board to imprinter designs
...
As above.
2016-04-08 10:22:46 +01:00
octareenroon91
00984ac291
Add Drone Shell to Protolathe
...
Drone shell constructable from protolathe
2016-04-07 21:31:25 -05:00
AnturK
80eb5833e9
Merge pull request #16470 from KorPhaeron/accelerator
...
Laser Cannon Changes
2016-04-07 18:51:18 +02:00
Cheridan
457888ce0b
Merge pull request #16628 from erwgd/AutolatheMakeHydroTools
...
Adds hydroponics tools and shovels to autolathe_designs.dm
2016-04-05 19:35:47 -05:00
