266 Commits

Author	SHA1	Message	Date
kevinz000	36f1e952b4	Merge pull request #11357 from Ghommie/Ghommie-cit606 ... Patches some awful integrated circuit examiner runtime errors.	2020-03-08 08:14:58 -07:00
Ghommie	a298a34ae9	Oh yea.	2020-03-06 14:57:34 +01:00
Ghommie	5d6eb6f24b	Patches some awful integrated circuit examiner runtime errors.	2020-03-06 14:56:49 +01:00
kevinz000	16d6ba9e21	Merge pull request #11323 from Ghommie/Ghommie-cit600 ... Porting a couple material datums code updates and fixes.	2020-03-06 00:17:21 -07:00
Ghommie	f2c8a7cd6f	Porting a couple material datums code updates and fixes.	2020-03-04 15:59:46 +01: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	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	eca0e0f2dc	Merge remote-tracking branch 'citadel/master' into mobility_flags	2020-02-13 00:39:20 -07:00
Ghommie	c34714cb90	Something about the in operator and spaceDMM version update.	2020-02-10 07:37:59 +01:00
Seris02	6cc6aa12be	yeehaw it's done	2020-02-05 16:54:57 +08:00
kevinz000	6a8a606f97	Merge remote-tracking branch 'citadel/master' into mobility_flags	2020-02-04 16:01:25 -07:00
Ghommie	a726f09201	Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit229	2020-02-04 03:54:52 +01:00
kevinz000	2393dc26eb	Merge pull request #10779 from Ghommie/Ghommie-cit538 ... added a second macro argument to STATION_TIME and STATION_TIME_TIMESTAMP.	2020-02-02 16:31:59 -07:00
Ghommie	95db5084ab	Screw commit history.	2020-02-02 01:26:04 +01:00
Ghommie	188f726ffd	unicode support port wip	2020-01-31 05:32:00 +01:00
Ghommie	0dba1b5102	added a second macro argument to STATION_TIME and STATION_TIME_TIMESTAMP.	2020-01-30 02:17:02 +01:00
Seris02	74be93a8cc	hasSiliconAccessInArea vars change	2020-01-21 11:44:49 +08:00
Seris02	fdf3871cb7	Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into hijackbackup	2020-01-18 18:30:51 +08:00
Seris02	04b34ec8ed	hijack implant	2020-01-18 18:04:31 +08:00
kevinz000	7bcb37c5d1	Merge remote-tracking branch 'citadel/master' into mobility_flags	2020-01-16 21:12:56 -07:00
Putnam	d29603ad77	Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into arousal-bad	2020-01-15 15:57:32 -08:00
AffectedArc07	16a37e2769	Standardises all files from CRLF to LF	2020-01-12 14:28:01 +00:00
Putnam	48fadffbfb	Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into arousal-bad	2020-01-10 17:57:03 -08:00
kevinz000	7378d91684	([\W\.])Knockdown\(	2020-01-06 03:39:20 -08:00
Putnam	d75a525b3c	let's fix arousal huh	2020-01-05 19:10:48 -08:00
Ghommie	37441437d1	a	2019-12-28 23:02:28 +01:00
Ghommie	e74339ce8b	Jfc that's a lot of work!	2019-12-23 04:24:13 +01:00
BlackMajor	8817f04e19	Merge pull request #9747 from Ghommie/Ghommie-cit329 ... Fixing AI holopad speech text being small and whispers ending in multiple exclamation marks oxymoron.	2019-12-10 11:18:55 +13:00
Ghommie	91ffa11bc9	Nerfs circuit pneumatic cannons and guns with extra sanity checks.	2019-12-04 01:07:36 +01:00
Ghommie	71a5d12c44	Don't run away Assembly!! I'll end you!!	2019-12-03 23:08:11 +01:00
Ghommie	f9680130f9	Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit329	2019-11-27 18:48:20 +01:00
Ghommie	dd101ef221	Part 2	2019-11-19 18:00:56 +01:00
Ghommie	f401e622c3	Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit329	2019-11-15 01:01:08 +01:00
kevinz000	2f4562a63b	Merge pull request #9656 from Ghommie/Ghommie-cit290 ... Purging a lot of space indention in favor of tabs.	2019-11-14 15:55:04 -07:00
Ghommie	e977ba6729	Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit290	2019-11-10 23:17:58 +01:00
Ghommie	1e49ce76d3	Dreamchecker compatibility changes, part 1.	2019-11-10 20:48:30 +01:00
Ghommie	298f2e02c6	Fixing AI holopad speech text being small and whispers ending in multiple exclamation marks oxymoron.	2019-11-08 22:33:26 +01:00
Ghommie	dcc81d92b5	Fixing a few throw_at calls and modular computer processors Init.	2019-11-04 00:12:41 +01:00
Ghommie	a5b37b658b	Purging a lot of space indention in favor of tabs.	2019-10-29 15:46:31 +01:00
Ghommie	e1928a18f1	Porting GetComponent macros removal, and some related changes.	2019-10-23 15:04:28 +02:00
deathride58	ea9eaedf1a	Ports BeeStation/BeeStation-Hornet#345	2019-08-21 22:16:44 -04:00
kevinz000	4d39d28f74	Update output.dm	2019-06-30 03:55:03 -07:00
kevinz000	2f2885f1d6	Merge pull request #8558 from Ghommie/Ghommie-cit35 ... Ports in the container_type to reagents flags refactor.	2019-06-08 01:26:28 -07:00
deathride58	aa53cc9ea9	Merge branch 'master' into fuckatmos	2019-06-07 04:38:47 -04:00
Ghommie	4d5332346e	Compiling was too slow.	2019-06-07 06:37:03 +02:00
Ghommie	7aac9e6280	Updates reagents a bit.	2019-06-07 06:27:04 +02:00
kevinz000	e63f9f385b	Merge pull request #8359 from Useroth/pneumatic-and-stun-buff ... [MERGE READY]Reduces the complexity of the two new circuits: pneumatic cannon and stunner.	2019-05-31 19:18:53 -07:00
kevinz000	843bfc3a3e	Merge pull request #8427 from CalamaBanana/quick-fix-for-importing-custom-colored-circuits ... Removes color-whitelist blocking custom-colored circuit blueprints from being imported	2019-05-27 03:30:07 -07:00