843 Commits

Author	SHA1	Message	Date
Ghommie	5bfbcd0948	Fixing some GetElement runtimes.	2020-03-15 15:12:35 +01:00
kevinz000	69c21f4b76	Merge pull request #10327 from Seris02/tggenetics ... ports tg genetics	2020-03-11 17:01:37 -07:00
Ghommie	0587d3482d	Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit604	2020-03-09 21:53:22 +01:00
Seris02	cccd0e9eef	Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics	2020-03-09 16:49:32 +08:00
Ghom	1c5aa2f933	Merge pull request #11377 from Kraseo/contractor-fixes ... Some contractor adjustments & fixes	2020-03-09 00:26:54 +01:00
Ghom	8878733fc1	Merge pull request #11317 from deathride58/WEPORTINSYNTHSBOI ... Ports Skyrat's synths (Plus limb rendering overhaul and more)	2020-03-09 00:26:06 +01:00
Lin	1a36d6e6fa	Merge pull request #10770 from Ghommie/Ghommie-cit536 ... Removes an unused file and another outdated one.	2020-03-07 17:59:12 -06:00
Kraseo	a5ef41c0fc	adjust numbers, fix shuttle dropoffs	2020-03-07 20:31:49 +01:00
Kraseo	ad20fb1a0e	Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into contracties	2020-03-06 11:58:11 +01:00
kevinz000	d376b99af6	Merge pull request #11315 from Citadel-Station-13/Ghommie-patch-3-2 ... Fixing a little issue with the Holodeck's Kobayashi Maru phaser	2020-03-06 00:19:51 -07:00
deathride58	2e35c09dec	Merge pull request #10451 from kevinz000/mobility_flags ... Mobility flags + combat rework stuff refactoring, fixes a few edge cases including the Oh Dreaded Xenomorph Hardstuns, etc etc time to break the game	2020-03-05 20:03:56 -05:00
Ghommie	2cbdae2f0a	Made flavor texts into an element datum.	2020-03-05 18:46:33 +01:00
Ghom	5e4f8dc6a0	Merge pull request #11181 from Detective-Google/big-chode-energy ... changes sausage girth from circumference -> diameter	2020-03-04 23:49:58 +01:00
deathride58	49ad376e5e	Adds a very basic soft restriction system. There's definite room for improvement, but this is good enough for now. Am too hongry for this.	2020-03-03 17:44:10 -05:00
Ghom	c0d4c30711	Update _lists.dm	2020-03-03 14:57:32 +01:00
kevinz000	1e99cd0bfe	Merge remote-tracking branch 'citadel/master' into mobility_flags	2020-03-03 03:08:41 -07:00
Kraseo	e3c77f2f5a	part 4: the one where i slowly go insane	2020-03-01 22:05:35 +01:00
Kraseo	d93ade7e03	part 2: bloody tendency	2020-03-01 17:37:18 +01:00
Kraseo	38f7821dd6	part 1: battle stream	2020-03-01 16:56:13 +01:00
kevinz000	56eab760fc	Merge remote-tracking branch 'citadel/master' into mobility_flags	2020-02-27 20:11:36 -07:00
Detective-Google	1f88a22d04	Merge branch 'master' into big-chode-energy	2020-02-27 16:39:57 -06:00
Detective Google	b7aad30d3c	girth -> diameter	2020-02-27 16:38:14 -06:00
Ghommie	a91464bf64	Fixing escaped characters in flavor texts.	2020-02-27 02:29:44 +01:00
Ghom	485241a361	cleanup detail	2020-02-23 13:32:46 +01:00
Ghommie	0d67e81ad5	Yo.	2020-02-23 13:18:16 +01:00
Ghommie	2b740f9bad	[s] Fixing an issue with slot machines crashing the server.	2020-02-23 13:09:21 +01:00
Ghom	b7fab93209	Merge pull request #11186 from Putnam3145/fixed-flavor ... Fixed temp flavor text (for real)	2020-02-22 15:09:58 +01:00
Seris02	c3ec44b0d0	Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tggenetics	2020-02-22 19:54:10 +08:00
Putnam	d328d554ba	Reduced copypasta	2020-02-22 02:38:57 -08:00
kevinz000	f6542b381c	Merge remote-tracking branch 'citadel/master' into mobility_flags	2020-02-21 23:29:25 -07:00
Ghommie	8fbfd07692	Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229	2020-02-22 00:55:32 +01:00
kevinz000	a784a74ccb	Merge remote-tracking branch 'citadel/master' into mobility_flags	2020-02-21 13:35:26 -07:00
Putnam	146b2a35f2	fixed temp flavor text (for real)	2020-02-21 00:26:42 -08:00
kevinz000	2dd5a0cfb8	Merge branch 'master' into hijack	2020-02-19 22:25:31 -07:00
kevinz000	0e4692c63d	Merge remote-tracking branch 'citadel/master' into mobility_flags	2020-02-18 18:16:34 -07:00
kevinz000	7ee04aa608	Merge pull request #10998 from Ghommie/Ghommie-cit569 ... Something about the in operator and spaceDMM version update.	2020-02-15 12:17:37 -07:00
kevinz000	6e2e7e29d1	Merge pull request #11072 from Ghommie/Ghommie-cit576 ... Doubled halved flavor text max length and removed crappy code.	2020-02-15 11:46:00 -07:00
Seris02	2d9c8ce8fc	fixing merge conflicts	2020-02-15 15:41:52 +08:00
Ghom	1e57664a99	Merge pull request #10934 from kevinz000/actual_ghost_newscasters ... Ok that last merge was a complete mistake so I kind of redid the feature myself (book/newscaster ghost reading)	2020-02-14 19:21:48 +01:00
Ghommie	c5b4cf0e6b	Ok.	2020-02-13 14:06:05 +01:00
Ghommie	315b0a9645	Fixes halved flavor text max length and removing some crappy code.	2020-02-13 14:05:40 +01:00
kevinz000	4345f01322	Merge pull request #11021 from Ghommie/Ghommie-cit571 ... Porting tgs DMAPI and script updates, getrev updates and OoM errors handling.	2020-02-13 04:11:01 -07:00
kevinz000	eca0e0f2dc	Merge remote-tracking branch 'citadel/master' into mobility_flags	2020-02-13 00:39:20 -07:00
kevinz000	4e419eed03	Merge pull request #10987 from Ghommie/Ghommie-cit567 ... Something about missing privates sprites and bad code.	2020-02-12 23:56:53 -07:00
Ghom	2ed19e0a5a	Merge pull request #10861 from ancientpower/far-sliding-port ... Ports /vg/station drink sliding	2020-02-12 09:06:03 +01:00
Ghommie	0caabe8018	Porting tgs DMAPI and script updates, as well as getrev updates and something bout OoM.	2020-02-11 15:23:03 +01:00
kevinz000	276f4b5fae	Merge remote-tracking branch 'citadel/master' into actual_ghost_newscasters	2020-02-10 04:32:01 -07:00
kevinz000	690c14a716	Merge remote-tracking branch 'citadel/master' into actual_ghost_newscasters	2020-02-10 04:29:22 -07:00
Artur	816f94bd61	pandemic fixes	2020-02-10 10:20:57 +02:00
Ghommie	c34714cb90	Something about the in operator and spaceDMM version update.	2020-02-10 07:37:59 +01:00