230 Commits

Author	SHA1	Message	Date
TrilbySpaceClone	7e51cf9ab3	Removed unused techweb var	2020-03-04 16:30:10 -05:00
Ghom	26bbc64f16	Merge pull request #11136 from Owai-Seek/broomport-2-17-19 ... Ports Broom, Tweak Janitor Vendor	2020-02-20 11:48:06 +01:00
Winter Flare	1a994e7f1e	Ports Broom, Tweak Janitor Vendor ... Ports Brooms from TG https://github.com/tgstation/tgstation/pull/49120 Makes Broom printable. Reduces Broom sound effect. Updates Janitor Vendor to have equipment for at least 2 janitors.	2020-02-17 23:36:22 -05:00
necromanceranne	5c2e244ee0	Ports /tg/ pr #44529, reverts #9092	2020-02-16 22:20:50 +11:00
kevinz000	14fdd90618	Nerfs public autolathes (#10970)	2020-02-16 07:37:24 +01:00
Ghom	33931da018	Merge pull request #11013 from r4d6/pickaxe ... Add two more pickaxes, Titanium & Plasteel	2020-02-14 19:34:01 +01:00
Ghom	121b37410a	Merge pull request #10997 from Owai-Seek/tinytweaks-2-9-20 ... Sprites, Tweaks, and Snacks, QoL	2020-02-13 16:40:12 +01:00
r4d6	8b68e57de0	Add the pickaxes	2020-02-10 22:02:39 -05:00
Winter Flare	bb641fecf8	Sprites, Tweaks, and Snacks ... -Fixes Trash Can recipie. Now craftable with 10 metal, removed with welder. -Adds an additional sprite for Duke Purple Tea so Tea and Coco don't look the same. -Adds Bacon and Eggs Sprite and Food Item -Adds Unique Sprite for Drying Agent bottle. -Adds Chocolate Bar to the... Chocolate Vendor. -Allows Trash Bag to fit Limbs (Not Heads) -Allows Mops to be Printable -Allows Bio Bags to pick up Limbs and Organs. Disallows Cybernetics, Brains, and Implants. Ports the following from TG: Printable Mops https://github.com/tgstation/tgstation/pull/44141 Makes Limbs Small Weight (To Fit in Trashbags) https://github.com/tgstation/tgstation/pull/44730	2020-02-09 23:07:32 -05:00
TrilbySpaceClone	5dbfc9a514	Yay	2020-02-08 03:25:09 -05:00
Hatterhat	385aea3d14	rcd ammo to indeng, typo	2020-02-04 18:50:09 -06:00
kevinz000	66fc2e77f0	Merge pull request #10865 from Ghommie/Ghommie-cit550 ... Demodularizes and nerfs magnetic rifles/pistols with power cell requirements.	2020-02-04 03:35:33 -07:00
Ghom	bb3505c184	Merge pull request #10852 from MrJWhit/Comments-out-meteor-defense-tech-node ... Comments out meteor defense tech node	2020-02-04 05:26:25 +01:00
Ghom	33ef9b4619	Update all_nodes.dm	2020-02-04 05:15:52 +01:00
Ghommie	a365f3b499	Demodularize and nerfs mag rifles with re(?)added power cell requirements.	2020-02-03 05:16:32 +01:00
MrJWhit	d314619d0e	Comments out meteor defense tech node ... asdf	2020-02-01 23:34:33 -05:00
Hatterhat	e985d21ea3	fucking combifan	2020-02-01 20:23:01 -06:00
Hatterhat	471deba88c	large rcd carts 5head	2020-02-01 13:26:43 -06:00
Hatterhat	348fa8be86	salt pr @kevinz000	2020-01-20 17:27:51 -06:00
Hatterhat	28a2cc4a3d	.357 AP printable from illegal ballistics	2020-01-19 23:55:12 -06:00
keronshb	69b5164103	Merge branch 'master' into RemoteMoodResearch	2020-01-16 15:50:11 -05:00
Hatterhat	83f8e42fb3	Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tg-40046	2020-01-12 12:37:19 -06:00
AffectedArc07	16a37e2769	Standardises all files from CRLF to LF	2020-01-12 14:28:01 +00:00
Hatterhat	0773f1b7fa	sweet merciful FUCK what is this merge	2020-01-12 02:53:30 -06:00
kevinz000	60524fb9c7	Merge pull request #10416 from r4d6/RCD-Updates ... Massive RCD Port & Updates	2020-01-12 00:45:21 -08:00
kevinz000	4b4864740b	Merge pull request #10522 from Hatterhat/syndi-sleeper ... printable syndicate sleepers - this is blackmajors fault im not gonna lie	2020-01-12 00:40:17 -08:00
Ghom	34502cab1d	Merge pull request #10247 from Seris02/atmosfirelock ... ATMOS Firelocks and more	2020-01-11 15:29:25 +01:00
Hatterhat	b5f8e46941	this is blackmajors fault im not gonna lie	2020-01-10 23:41:30 -06:00
Hatterhat	102e973737	considering these are basic nodes	2020-01-09 18:39:31 -06:00
Hatterhat	04aa0eda5a	tg 40046, 41695, 46726 - hope i didnt forget smth	2020-01-09 18:35:13 -06:00
r4d6	581654f13f	Add RPD to research	2020-01-09 13:55:31 -05:00
keronshb	a7af5203e7	This is a test to see if they all work together ... Title	2020-01-06 20:29:44 -05:00
keronshb	35cd77d433	Adds the nanite remote for some programs ... Adds a new remote function from tg	2020-01-06 20:28:33 -05:00
Seris02	519d379cdf	Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into atmosfirelock	2020-01-03 17:42:53 +08:00
r4d6	7347cb0ba6	Merge branch 'master' into RCD-Updates	2020-01-03 03:09:11 -05:00
r4d6	58a986696f	Add RCD and RPD to Engie's protolathe ... Half-port with bonus : https://github.com/tgstation/tgstation/pull/47289	2020-01-03 02:46:25 -05:00
r4d6	5c94e02eac	Add simple RCD Circuits ... Port : https://github.com/tgstation/tgstation/pull/45357	2020-01-03 02:32:43 -05:00
BlackMajor	08d042901c	thank you github	2020-01-02 22:16:47 +13:00
BlackMajor	aabb39a364	Revert "Merge branch 'master' into Yeehaw" ... This reverts commit 30e3edaac1, reversing changes made to 62c8fce043.	2020-01-02 22:06:31 +13:00
BlackMajor	30e3edaac1	Merge branch 'master' into Yeehaw	2020-01-02 22:03:58 +13:00
BlackMajor	3239acf74d	Sync	2020-01-02 22:02:55 +13:00
kevinz000	ec67a38093	Merge pull request #10330 from keronshb/keronnanite ... More nanites from /tg/station	2019-12-31 19:32:05 -08:00
BlackMajor	8085022d97	Couple of changes. Starting on the point bank.	2019-12-31 23:28:30 +13:00
Seris02	9b3654e4ff	telescopic IVs	2019-12-29 23:26:53 +08:00
BlackMajor	375e59a77d	Merge branch 'master' into Yeehaw	2019-12-29 22:12:40 +13:00
BlackMajor	206a5e168a	More mining changes	2019-12-29 20:15:49 +13:00
keronshb	390cfd8b64	Nanite ports from /tg/ ... Ports a couple of the newer nanite features from /tg/	2019-12-28 16:56:17 -05:00
Hatterhat	681508482c	magazine metal cost tweaks, speedloader in AIB	2019-12-24 04:15:25 -06:00
Seris02	61ab3685f1	atmos firelock, changes to temp blocking	2019-12-20 14:14:01 +08:00
Linzolle	70e50e57cd	Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into abductor-update	2019-12-17 20:21:49 -06:00