3848 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
kevinz000andArchie	dd45aece5b	Merge pull request #10330 from keronshb/keronnanite ... More nanites from /tg/station	2021-06-04 14:17:33 -03:00
GhomandArchie	629b5975ca	Merge pull request #10096 from Citadel-Station-13/kevinz000-patch-123 ... nanites can no longer spread through atmospherics-blocking objects	2021-06-04 14:17:03 -03:00
DahlularandGitHub	1d9a8dfca8	Merge pull request #1228 from ArchieBeepBoop/craft1 ... TGUI Next Crafting	2021-06-04 06:21:21 -06:00
DahlularandGitHub	a307d46a15	Merge pull request #1227 from CapnMachaddish/snek-2.0 ... snek 2.0	2021-06-04 06:19:38 -06:00
DahlularandGitHub	3204045654	Merge pull request #1226 from ArchieBeepBoop/stomach ... Cybernetic stomachs	2021-06-04 06:18:26 -06:00
DahlularandGitHub	bd990db009	Merge pull request #1224 from ArchieBeepBoop/CLEANSYOURFACE ... /datum/element/cleaning cleans your face!	2021-06-04 06:17:13 -06:00
DahlularandGitHub	262591ec3e	Merge pull request #1222 from ArchieBeepBoop/dineradd ... Diner additions	2021-06-04 06:07:29 -06:00
DahlularandGitHub	d6821aa57d	Merge pull request #1220 from ArchieBeepBoop/thief ... Something about autotraitor thief	2021-06-04 06:02:52 -06:00
DahlularandGitHub	297049cc0f	Merge pull request #1219 from ArchieBeepBoop/gas ... Something about ghosts and admins not being able to analyze canisters	2021-06-04 06:02:27 -06:00
GhomandArchie	2f4acc589f	Merge pull request #10893 from Arturlang/TGUI_Next_Crafting ... [READY]TGUI Next Crafting	2021-06-03 17:02:11 -03:00
GhomandArchie	1ead72d12f	Merge pull request #10811 from Arturlang/crafting_componitization ... [READY]Ports TG updates to crafting and componentizes it	2021-06-03 16:29:33 -03:00
Marvin Megavolt	c439ee995d	snek 2.0	2021-06-03 03:40:00 -05:00
Archie	737685ca7f	Cybernetic stomachs	2021-06-03 03:48:02 -03:00
DahlularandGitHub	5ee4e0c14e	Merge pull request #1225 from ArchieBeepBoop/bottle ... Ports: New Bottle Sprites	2021-06-02 21:27:01 -06:00
siliconsandArchie	d97b68b689	Merge pull request #14613 from HeroWithYay/Bottle ... New Bottle Sprites	2021-06-03 00:16:13 -03:00
Archie	67b63f3dff	/datum/element/cleaning cleans your face!	2021-06-02 23:11:51 -03:00
Archie	3345e45d91	Diner additions	2021-06-02 19:52:33 -03:00
Archie	f3218677d3	Something about autotraitor thief	2021-06-02 18:05:28 -03:00
Archie	70e4319ce7	Fixes unreachable code	2021-06-02 16:05:05 -03:00
DahlularandGitHub	dcac6a9e7e	THIS SHIT DOESN'T LAST LONG ENOUGH. GIVE ME MORE RAIN.	2021-06-02 08:32:22 -06:00
DahlularandGitHub	e4849634b6	Merge pull request #1218 from ArchieBeepBoop/cleanup ... Cleaning up Layenia Rain Code	2021-06-02 03:25:52 -06:00
Archie	7403056507	Cleaning up Layenia Rain Code	2021-06-02 06:22:57 -03:00
DahlularandGitHub	6eb5a19fd3	Merge pull request #1217 from ArchieBeepBoop/rainingin ... It's raining in Layenia?	2021-06-02 03:05:28 -06:00
Archie	2032ce3017	It's raining in Layenia	2021-06-02 05:53:15 -03:00
Archie	dc9e374d24	Merge remote-tracking branch 'upstream/master' into rain	2021-06-02 04:20:31 -03:00
Archie	966da5dbbf	Rain v1	2021-06-02 04:20:23 -03:00
DahlularandGitHub	102675a6fb	Merge pull request #1216 from ArchieBeepBoop/radiationstuffagain ... Radiation flags and dissipation fix	2021-06-01 22:52:19 -06:00
Archie	266fafeaa2	Radiation flags and dissipation fix	2021-06-02 01:33:35 -03:00
DahlularandGitHub	651b5ace30	Merge pull request #1215 from ArchieBeepBoop/radiationstuffagain ... Fixes sludge spawning underneath structures / Sludge minor nerf	2021-06-01 21:54:16 -06:00
Archie	95cb98a093	aaaa	2021-06-02 00:50:27 -03:00
Archie	35fd4afb46	Fixes sludge spawning underneath structures.	2021-06-02 00:49:14 -03:00
Archie	bcadc3dc01	Nerf this	2021-06-01 23:45:56 -03:00
DahlularandGitHub	a9b239c113	Merge pull request #1214 from ArchieBeepBoop/radiationstuffagain ... Fixes a whoopsie with the plutonium sludge radiation component.	2021-06-01 20:19:26 -06:00
Archie	3e4d2b56c1	Whoopsie doopsie.	2021-06-01 23:05:59 -03:00
DahlularandGitHub	2c58c0bee7	Merge pull request #1213 from ArchieBeepBoop/harvesterrework ... Reworks Energy Harvesters, swiftly ends 40+ harvester meta	2021-06-01 18:32:55 -06:00
Archie	158b260683	Comment	2021-06-01 21:26:36 -03:00
Archie	a94f6cdbc0	Intensity change	2021-06-01 21:26:08 -03:00
Archie	509eb2b055	Temp changes	2021-06-01 21:25:31 -03:00
Archie	9121e7a6c4	Reworks Energy Harvester Limits and Feedback	2021-06-01 21:24:54 -03:00
DahlularandGitHub	f3aa289a68	Merge pull request #1212 from ArchieBeepBoop/heirloomstuff ... Adminbus heirloom objective	2021-06-01 16:24:40 -06:00
Archie	4925c15e49	Adminbus heirloom objective	2021-06-01 19:18:39 -03:00
DahlularandGitHub	1f2e31160c	Merge pull request #1167 from ArchieBeepBoop/tcomms ... [Experimental] Telecomms Updates + Telecomms TGUI Update	2021-06-01 15:52:54 -06:00
DahlularandGitHub	a073d136a4	Merge pull request #1206 from ArchieBeepBoop/autotator ... Excludes Ghost Roles from certain Health Events + Autotraitor Fix Package Pt2	2021-06-01 04:27:10 -06:00
DahlularandGitHub	287f59af1a	Merge pull request #1200 from ArchieBeepBoop/bluespacepipe ... Ports: Bluespace Pipes	2021-06-01 04:22:46 -06:00
DahlularandGitHub	dc2957900c	Merge pull request #1201 from ArchieBeepBoop/stargazerfix ... Makes Stargazers work on Layenia too	2021-06-01 04:18:54 -06:00
DahlularandGitHub	3aa6cd76ce	Merge pull request #1198 from ArchieBeepBoop/junglereserve ... Ports: Jungle Gateway	2021-06-01 04:11:54 -06:00
DahlularandGitHub	c9d6307dbf	Merge pull request #1211 from quotefox/revert-1173-vendingtipping ... Revert "Ports Vending Machine Tipping"	2021-06-01 04:07:54 -06:00
DahlularandGitHub	550f709ad9	Revert "Ports Vending Machine Tipping"	2021-06-01 04:07:43 -06:00
DahlularandGitHub	405ef52bcb	Merge pull request #1210 from quotefox/revert-1208-tame ... Revert "Something about taming vending machines"	2021-06-01 04:06:54 -06:00
DahlularandGitHub	3218c844bb	Revert "Something about taming vending machines"	2021-06-01 04:06:42 -06:00