547 Commits

Author	SHA1	Message	Date
Letter N	a19e306137	less redtext - updates anomalies	2020-08-03 20:53:36 +08:00
Letter N	b376a6b6c4	Merge remote-tracking branch 'origin/master' into TGUI-4	2020-07-30 14:43:52 +08:00
Letter N	5d4bb48628	another batch. MAJOR: ccpodlauncher, cargo/console.dm, smartfrige, holodeck/computer.dm, biogenerator	2020-07-29 15:10:01 +08:00
Lin	81a7542aa6	Merge pull request #12834 from silicons/clickcd_experimental ... Experimental hybrid clickdelay system (No seriously I'm trying my best to not call it Minecraft attack delays)	2020-07-28 21:51:10 -05:00
DeltaFire	9f3e7755ae	two line fix ... tin	2020-07-27 21:30:13 +02:00
silicons	22efdbffcd	woops	2020-07-26 23:08:41 -07:00
silicons	b20e3bc2b6	monkey attacks	2020-07-23 16:30:27 -07:00
silicons	ffd44b78ba	Merge remote-tracking branch 'citadel/master' into clickcd_experimental	2020-07-23 10:26:03 -07:00
silicons	1d99591b6b	Merge pull request #12807 from kappa-sama/patch-32 ... lowers stray cargo pod weight from 2x normal to 1/2 normal	2020-07-20 16:57:24 -07:00
silicons	98d3ac80d9	:pika:	2020-07-20 11:25:17 -07:00
kappa-sama	6cd9993e50	5	2020-07-17 15:54:45 -04:00
silicons	993b4ec222	Merge remote-tracking branch 'citadel/master' into unarmed_parry	2020-07-16 19:39:46 -07:00
Artur	af65b626e3	Merge remote-tracking branch 'Upstream/master' into TGUI-3.0	2020-07-16 15:56:08 +03:00
silicons	6121cbd091	Merge pull request #12738 from timothyteakettle/travelling-traders ... the travelling trader midround event	2020-07-15 08:50:20 -07:00
Artur	5f9364c5f8	Merge remote-tracking branch 'Upstream/master' into TGUI-3.0	2020-07-13 16:20:54 +03:00
Timothy Teakettle	c0687886e4	using initial is better practice	2020-07-12 21:38:09 +01:00
Timothy Teakettle	0705130448	small edgecase	2020-07-12 17:31:37 +01:00
timothyteakettle	8e31e3c534	a tonne of fixes	2020-07-12 01:56:24 +01:00
timothyteakettle	ab01a69c1f	bugfix	2020-07-12 00:53:31 +01:00
timothyteakettle	8712dd6de4	bugfixes	2020-07-12 00:31:45 +01:00
Timothy Teakettle	c1592ad162	more rewards	2020-07-11 23:27:29 +01:00
silicons	926f64e13d	Merge pull request #12722 from kappa-sama/patch-31 ... lowers wisdom cow's spawnrate to standard and makes it 66% less spammy	2020-07-11 00:49:29 -07:00
timothyteakettle	e571400b1b	lots of bug fixes	2020-07-11 03:35:15 +01:00
Timothy Teakettle	75b9eef74e	bug fixes	2020-07-10 22:52:08 +01:00
Timothy Teakettle	045169e1ee	actual trader subtypes	2020-07-10 22:50:22 +01:00
Timothy Teakettle	60b9e9dafe	trader event/mob	2020-07-10 21:06:53 +01:00
kappa-sama	af106b7628	10	2020-07-09 16:12:07 -05:00
Putnam	a625d6562b	Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into putnamos-for-real	2020-07-08 22:02:03 -07:00
silicons	6ee63f66aa	whew	2020-07-07 20:48:54 -07:00
Artur	20245f7319	Merge remote-tracking branch 'origin/master' into TGUI-3.0	2020-06-30 02:30:29 +03:00
Putnam3145	ee2fedd4af	Merge pull request #12390 from Ghommie/Ghommie-cit800 ... Porting brain trauma updates: Curse of madness, cloning traumas, random brain trauma event.	2020-06-29 12:44:33 -07:00
Artur	765ffdb1a1	Merge remote-tracking branch 'origin/master' into TGUI-3.0	2020-06-26 14:03:27 +03:00
Ghommie	ae053a9a08	Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit800	2020-06-23 03:12:49 +02:00
Artur	c41d2e78be	Conflicts!!!	2020-06-22 17:39:24 +03:00
DeltaFire	6cababd09b	yeeah no more free random nullcrates	2020-06-21 01:30:39 +02:00
Ghom	dd009ada48	Merge pull request #12542 from bunny232/scrubber ... Removes lewd events from the vent clog event	2020-06-19 23:07:23 +02:00
kevinz000	118ac1a775	Merge pull request #12548 from timothyteakettle/more-events ... ports several tg events including fugitives	2020-06-17 20:10:04 -07:00
Timothy Teakettle	d1432e20b0	woops make it back to 10 minutes	2020-06-16 23:54:44 +01:00
timothyteakettle	b59c8c1af6	fix maps	2020-06-16 02:44:11 +01:00
bunny232	8a1290b562	Update vent_clog.dm	2020-06-15 21:04:06 -04:00
bunny232	c9b1bbdb2c	Update vent_clog.dm	2020-06-15 21:00:07 -04:00
Artur	ceba739231	Cooonflicts	2020-06-16 01:23:42 +03:00
Timothy Teakettle	7fbfb4ad0e	Merge remote-tracking branch 'upstream/master' into embed-changes	2020-06-15 22:48:26 +01:00
Timothy Teakettle	d7bce8aec0	ports some events	2020-06-15 20:22:40 +01:00
Lin	bfe8ccdfb5	Merge pull request #11627 from kevinz000/combat_rework ... "Unofficial" Combat Rework Part 3: Blocking/Parrying	2020-06-12 16:39:11 -05:00
Timothy Teakettle	4c55e86da7	part 2	2020-06-10 23:14:25 +01:00
Timothy Teakettle	95b8cd3956	first port	2020-06-10 20:33:01 +01:00
Artur	b6dc41b852	Merge remote-tracking branch 'origin/master' into TGUI-3.0	2020-06-09 11:07:39 +03:00
Timothy Teakettle	994ab8ac16	fixes spacevines	2020-06-06 16:00:26 +01:00
Artur	19f215477e	Merge remote-tracking branch 'upstream/master' into TGUI-3.0	2020-05-30 18:52:02 +03:00