18144 Commits

Author	SHA1	Message	Date
Detective Google	6589065c38	scream	2020-01-12 15:25:51 -06:00
Detective Google	97c26c704d	Update Space_Station_13_areas.dm	2020-01-12 15:24:51 -06:00
Detective Google	81d3225819	?	2020-01-12 15:23:45 -06:00
Detective Google	99ba77ce01	aaaaaaaaaaaaaaaaaaaaaaaaaaaaaa	2020-01-12 15:23:05 -06:00
Detective Google	c7dcd0c8a3	grug hates merge conflicts	2020-01-12 15:19:44 -06:00
Detective Google	f6c5f81a83	Merge remote-tracking branch 'upstream/master' into the-p-o-o-l	2020-01-12 15:16:17 -06:00
Detective Google	c88efe84de	makes sharks drop fish meat	2020-01-12 15:14:34 -06:00
kevinz000	e1ae3f3c07	Merge pull request #10492 from Trilbyspaceclone/plastic__world ... Plastic snow	2020-01-12 00:49:39 -08:00
kevinz000	f210971889	Merge pull request #10393 from chefferz/chefferz-forcefieldstostronk ... Significantly lowers the forcefield projector health, lowers armor.	2020-01-12 00:47:17 -08:00
kevinz000	60524fb9c7	Merge pull request #10416 from r4d6/RCD-Updates ... Massive RCD Port & Updates	2020-01-12 00:45:21 -08:00
kevinz000	0b56e76b29	Merge pull request #10504 from Xantholne/xantholne-bees02 ... Bees	2020-01-12 00:42:19 -08:00
kevinz000	6396c95bec	Merge pull request #10480 from Putnam3145/more_flavor ... Added second flavor text, not copied anywhere.	2020-01-12 00:41:47 -08:00
kevinz000	fe720dbb9c	Merge pull request #10500 from rossark/robo ... ports fast augmentation surgery pr from /tg/	2020-01-12 00:41:30 -08:00
Putnam3145	01db064038	Merge pull request #10532 from Ghommie/Ghommie-cit503 ... A few reagents related fixes.	2020-01-12 00:41:00 -08:00
kevinz000	c69d882943	Merge pull request #10521 from BlackMajor/master ... Fixes roundstart borg spawns, plus a little bit extra.	2020-01-12 00:40:48 -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
kevinz000	ddff903532	Merge pull request #10518 from Seris02/explosionport ... ports the explosion rework thingamajig	2020-01-12 00:38:43 -08:00
kevinz000	ce1dabb585	Merge pull request #10513 from r4d6/open-message ... Add a message when pulsing the open wire on airlocks	2020-01-12 00:37:33 -08:00
kevinz000	68d02de239	Merge pull request #10516 from BonniePandora/Proc-call-shit ... Allows calling procs in SDQL update queries without storing the return anywhere	2020-01-12 00:37:12 -08:00
kevinz000	f5995cfaaa	this is a massive security risk	2020-01-12 00:36:52 -08:00
Detective Google	d5b227a0ca	adds the POOL to box station ... F in chat for dorms 7.	2020-01-11 23:34:07 -06:00
Lin	d6b28c59d4	Merge pull request #10509 from Ghommie/Ghommie-cit502 ... Fixes reagent containers examine.	2020-01-11 22:16:27 +00:00
Ghommie	16db38a08f	Travis man good	2020-01-11 20:51:15 +01:00
Ghommie	c709a9e4a9	A few reagents related fixes.	2020-01-11 18:45:54 +01:00
kevinz000	af562d1421	Update bloodsucker_life.dm	2020-01-11 06:54:29 -08:00
Ghom	34502cab1d	Merge pull request #10247 from Seris02/atmosfirelock ... ATMOS Firelocks and more	2020-01-11 15:29:25 +01:00
Ghom	7fa3289013	Merge pull request #10497 from Trilbyspaceclone/uplink_redo ... Cleans up uplink_items into each folder	2020-01-11 15:28:04 +01:00
Ghom	894abc67c0	Merge pull request #10502 from Linzolle/big-boss ... [s] i'm trying to sneak around	2020-01-11 15:24:21 +01:00
Ghom	c2b3e7b0ec	Merge pull request #10505 from LetterN/beep-boom ... better electropack ui	2020-01-11 15:21:08 +01:00
Ghom	1f9a7066f0	Merge pull request #10445 from Citadel-Station-13/kevinz000-patch-7 ... Grey Tide spear is now vareditable	2020-01-11 15:10:16 +01:00
Ghom	3a72d1f434	Merge pull request #10495 from Citadel-Station-13/kevinz000-patch-12 ... allow guests to use looc	2020-01-11 15:09:37 +01:00
Ghom	e12f5e9e44	Merge pull request #10511 from Citadel-Station-13/kevinz000-patch-15 ... Fixes health analyzers	2020-01-11 15:07:55 +01:00
Ghom	e851939281	Merge pull request #10523 from Hatterhat/fuck-you-baltimore ... you can finally put armor plating on your standard explorer suit hood again	2020-01-11 15:06:20 +01:00
Ghom	5dc598e2ea	Merge pull request #10465 from Putnam3145/more-dojo-tweaks ... More ghost dojo tweaks	2020-01-11 15:03:45 +01:00
Putnam	312da86424	Suggested changes	2020-01-11 01:28:49 -08:00
Hatterhat	2006ccf4ef	nicc you buffoon you never adjusted the hood type	2020-01-11 00:12:52 -06:00
Hatterhat	b5f8e46941	this is blackmajors fault im not gonna lie	2020-01-10 23:41:30 -06:00
BlackMajor	30fc5b560b	Couple of lingering fixes	2020-01-11 17:57:18 +13:00
Seris02	29b66db9e3	Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into explosionport	2020-01-11 11:29:30 +08:00
Seris02	0b0b80f174	explosions	2020-01-11 11:22:59 +08:00
BonniePandora	bb26f21c71	I have no idea what I'm doing to be quite honest	2020-01-11 02:43:58 +00:00
Lin	42263a435a	Merge pull request #10489 from Seris02/chameleonthing ... Fixes and improvements for chameleon clothes	2020-01-11 01:12:43 +00:00
Lin	fb94bf5fa0	Merge pull request #10482 from kappa-sama/modularthing ... modular citadel file destruction but only slightly	2020-01-11 00:30:58 +00:00
Lin	cd8e83e7c0	Merge pull request #10486 from Seris02/observe ... moves observe to ghost tab instead of sticking it in the ooc tab	2020-01-10 23:56:46 +00:00
Lin	147d948ad8	Merge pull request #10498 from Citadel-Station-13/kevinz000-patch-13 ... reduces table cooldown to 0.4	2020-01-10 23:55:07 +00:00
r4d6	96c75eb5ca	Add a message when pulsing the open wire on airlocks	2020-01-10 17:01:46 -05:00
kevinz000	8f60099595	Merge pull request #10488 from Xantholne/xantholne-cowboy02 ... Red Dead Redemption 2 but it's a crappy 2D space man game	2020-01-10 14:01:06 -08:00
kevinz000	d4592449d2	Merge pull request #10484 from deathride58/topiccommandlimit ... [s] Caches the status topic to prevent low-effort DDoSes	2020-01-10 14:00:43 -08:00
kevinz000	9cec806875	Update scanners.dm	2020-01-10 12:48:55 -08:00
kevinz000	7392760f38	Update scanners.dm	2020-01-10 12:48:19 -08:00