12162 Commits

Author	SHA1	Message	Date
TrilbySpaceClone	86ea13afeb	Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into patch-270	2020-01-22 23:00:54 -05:00
Ghom	bf62563507	Merge pull request #10410 from CameronWoof/free-the-lizard ... Humans and anthromorphs can now use lizard tails.	2020-01-23 03:06:52 +01:00
Ghom	3ce27d6c36	Merge pull request #10638 from Hatterhat/patch-3 ... compact defibs have a properly set departmental flag now	2020-01-23 02:51:17 +01:00
Ghom	04811c9c22	Merge pull request #10450 from Citadel-Station-13/kevinz000-patch-8 ... (is this really a good idea) hitscan emitters	2020-01-23 02:44:17 +01:00
Ghom	fcbc5149c4	Merge pull request #10606 from r4d6/patch-2 ... Update the Passive Vents that I added	2020-01-23 02:40:54 +01:00
r4d6	c78944c5bc	Update	2020-01-22 13:47:57 -05:00
r4d6	869e31b27b	Removing useless code	2020-01-22 13:17:47 -05:00
r4d6	96c0a86b5f	Make the Radiation Hardsuit a Voidsuit instead	2020-01-22 13:17:29 -05:00
Arturlang	0a545da35d	Webedit galore	2020-01-22 18:12:26 +01:00
Arturlang	e025c8a743	Oh right its a typo	2020-01-22 18:11:37 +01:00
Trilbyspaceclone	ebb6ac1d7b	more words	2020-01-22 11:33:39 -05:00
Poojawa	ace1950800	Makes listen checks a tad cheaper. ... Improves external sounds with falloff	2020-01-22 00:07:39 -06:00
Poojawa	a665aeb50f	ok just skip this line I guess	2020-01-21 23:33:11 -06:00
Poojawa	9415ea095d	Fixes blindness on transfers	2020-01-21 23:32:32 -06:00
Trilbyspaceclone	bc1500c04c	Update cleanbot.dm	2020-01-21 18:33:04 -05:00
Chayse Ramsay	5e5d80238b	Revolver caliber changes; .357 revolvers can now also load .38 but not vice-versa. ... Effectively it means you can load .38 rubber into a .357 revolver to make it less than lethal, or use the various different .38 ammo types.	2020-01-21 22:29:15 +00:00
Trilbyspaceclone	181984f478	Update materials.dm	2020-01-21 09:31:38 -05:00
kevinz000	ed5172f9ca	changes	2020-01-20 23:17:58 -07:00
kevinz000	8f60d01208	Merge remote-tracking branch 'citadel/master' into kevinz000-patch-8	2020-01-20 22:47:21 -07:00
kevinz000	b5ca546ac3	patch	2020-01-20 22:45:21 -07:00
Ghom	8e49c99ca0	Merge pull request #10619 from Seris02/conveyor ... conveyor updates	2020-01-21 03:37:42 +01:00
Ghom	3c53619f2a	Merge pull request #10616 from Citadel-Station-13/kevinz000-patch-15 ... Renames created volume in pyrotechnics to multiplier to alleviate confusion	2020-01-21 03:05:22 +01:00
kevinz000	41191c3974	trauma	2020-01-20 19:01:11 -07:00
Ghom	7a3f0d140c	Merge pull request #10468 from Citadel-Station-13/stop-ghosting ... ghosting no longer makes it so you don't count for abductors	2020-01-21 02:26:25 +01:00
kevinz000	efe3ebdb53	bet	2020-01-20 17:50:07 -07:00
Hatterhat	fae0d6fe3f	remember when i hoped i didnt forget something	2020-01-20 18:06:07 -06:00
Ghommie	ddf037da92	Trilby's solar panels PR but improved.	2020-01-21 00:28:41 +01:00
Hatterhat	348fa8be86	salt pr @kevinz000	2020-01-20 17:27:51 -06:00
Commandersand	62c5fabcac	oops	2020-01-20 15:18:08 -06:00
Commandersand	a3f8233130	MEM	2020-01-20 15:15:28 -06:00
Trilbyspaceclone	89bb60ac16	Update parts.dm	2020-01-20 16:12:40 -05:00
Trilbyspaceclone	9eb9f08a92	Update glassware.dm	2020-01-20 16:11:42 -05:00
Trilbyspaceclone	ab464de0b7	Update glass.dm	2020-01-20 16:10:12 -05:00
Ghom	038f5e4b0e	Yea, sorry for being so naive right now.	2020-01-20 21:59:12 +01:00
Ghom	a921b27c63	I want a different maintainer to merge this now.	2020-01-20 21:58:21 +01:00
Ghommie	9604b27482	github web editor is so bad	2020-01-20 21:55:02 +01:00
Ghom	5500e349e3	Merge branch 'master' into kevinz000-patch-10	2020-01-20 21:48:28 +01:00
Ghom	9ea6e896fb	Kevinz, please.	2020-01-20 21:43:00 +01:00
Commandersand	cd48f1a152	forcewall	2020-01-20 14:22:23 -06:00
Ghommie	5644617786	Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit450	2020-01-20 20:59:38 +01:00
Ghom	28a6e6eccf	Merge pull request #10621 from Hatterhat/am-i-really-gonna-do-this ... .357 AP printable from illegal ballistics	2020-01-20 18:50:25 +01:00
Seris02	ab771d9505	I deleted an important thing	2020-01-20 15:48:55 +08:00
kevinz000	593e626233	Merge pull request #10346 from deathride58/limbstamlossnerf ... Nerfs limb stamcrit by doubling the base limb stam regen rate and making disabled limbs double the regen rate further	2020-01-19 23:11:02 -07:00
Hatterhat	28a2cc4a3d	.357 AP printable from illegal ballistics	2020-01-19 23:55:12 -06:00
kevinz000	46376904e0	extra line	2020-01-19 22:35:46 -07:00
kevinz000	a99406b46a	oh fucking boy	2020-01-19 22:33:16 -07:00
Hatterhat	9b9c7c3018	exo nerf	2020-01-19 20:37:31 -06:00
Seris02	afd848e45a	weh	2020-01-20 10:29:09 +08:00
Ghom	77911f9009	Merge pull request #10597 from Putnam3145/player-panel-can-reenter ... Ghost role eligibility activation in player panel	2020-01-20 03:24:46 +01:00
Ghom	8a091c5140	Merge pull request #10614 from Putnam3145/suicide_option ... Made suicide a config flag	2020-01-20 03:24:00 +01:00