26074 Commits

Author	SHA1	Message	Date
silicons	0d63fc9cf4	Update shuttles.dm	2020-12-12 19:02:56 -07:00
silicons	66403e3a9e	Merge pull request #13713 from timothyteakettle/alt-click-gas-mask ... all gas masks (but welding + glass) can be alt clicked to show/hide identity	2020-12-12 18:53:13 -07:00
timothyteakettle	76b291c0b5	action	2020-12-13 01:16:25 +00:00
Timothy Teakettle	7dfb097bcc	close enough	2020-12-12 23:48:21 +00:00
Lin	0d95172bef	Merge pull request #13749 from Citadel-Station-13/silicons-patch-7 ... fixes nonsensical verb	2020-12-12 20:00:41 +00:00
silicons	ab9d26285c	Update dna.dm	2020-12-12 10:13:17 -07:00
silicons	abf950ee17	Update dna.dm	2020-12-12 02:49:27 -07:00
silicons	c2727ca278	Merge pull request #13743 from Linzolle/thunderdome ... thunderdome entertainment monitors fix + stuff	2020-12-12 01:55:53 -07:00
silicons	fab40166d3	Merge pull request #13737 from qwertyquerty/flash ... Flash the screen on climax	2020-12-12 01:52:17 -07:00
silicons	c00fb31da8	Update dna.dm	2020-12-12 01:47:23 -07:00
Putnam3145	f0e51d666c	Merge pull request #13617 from timothyteakettle/loadout-json ... loadout 2: electric boogaloo	2020-12-11 18:11:56 -08:00
timothyteakettle	3a017d1173	it works	2020-12-12 01:49:50 +00:00
silicons	60f9e97ce5	test	2020-12-11 17:31:27 -07:00
DeltaFire	e1bf6b94f9	Merge pull request #13747 from MrJWhit/thicc-fuel-tanks ... Porting to the /tg/ sprite changes, and functionality, of large reagent containers	2020-12-11 22:38:18 +01:00
Timothy Teakettle	99f50addc7	wip	2020-12-11 20:35:37 +00:00
Timothy Teakettle	45b22b2855	final touches	2020-12-11 19:41:56 +00:00
Lin	c1fee8e5c4	Merge pull request #13739 from timothyteakettle/tongue-and-eyes ... custom eyes and tongues now properly carry across cloning	2020-12-11 16:59:05 +00:00
Lin	4077537d45	Merge pull request #13734 from keronshb/Blobreflect-fix ... Reflective Blob fix	2020-12-11 16:58:07 +00:00
MrJWhit	d10c9db8b2	Update reagent_dispenser.dm	2020-12-11 10:31:42 -05:00
silicons	e252e073a1	Update stamina_combat.dm	2020-12-11 03:06:29 -07:00
silicons	1153f30b63	Update carbon.dm	2020-12-11 02:26:52 -07:00
silicons	34f2a94d1b	Update combat.dm	2020-12-11 02:23:26 -07:00
silicons	3891095a21	Update say.dm	2020-12-11 01:58:39 -07:00
timothyteakettle	d1003c206a	debug	2020-12-11 01:57:09 +00:00
DeltaFire	bece5971b8	Merge pull request #13745 from Arturlang/soulstone_references ... Adds more sanity to construct soul returning	2020-12-11 00:42:30 +01:00
Timothy Teakettle	62b5430985	yes	2020-12-10 21:53:20 +00:00
silicons	8af8063e73	Update input.dm	2020-12-10 13:39:22 -07:00
keronshb	07b56e1542	Adds new line ... new line added	2020-12-10 15:29:13 -05:00
MrJWhit	477330197c	Huh we already had this	2020-12-10 01:14:43 -05:00
silicons	a4e6df8f9a	Merge pull request #13738 from DeltaFire15/heretic-tweaks ... Updates the heretics gamemode with a bunch of changes from /tg/	2020-12-09 21:47:46 -07:00
silicons	821c3becc3	Merge pull request #13704 from Putnam3145/make-emotes-local ... Makes emotes show up in the "local" filter with TGUI	2020-12-09 21:47:06 -07:00
tgstation-server	5b74596d72	Update TGS DMAPI	2020-12-10 00:47:22 +00:00
timothyteakettle	73542f6688	Update new_player.dm	2020-12-09 17:49:52 +00:00
Artur	ef13b07dd4	Forgot this	2020-12-09 17:56:28 +02:00
Artur	827920dba7	Paranoid ramblings	2020-12-09 17:54:44 +02:00
timothyteakettle	264b72f91d	better verification	2020-12-09 02:01:37 +00:00
Linzolle	0ddc053a8b	what if mapmerge worked	2020-12-08 17:35:21 -06:00
Linzolle	3e951d334c	fix entertainment monitors	2020-12-08 17:21:14 -06:00
Timothy Teakettle	d3ad092869	new proc	2020-12-08 22:23:58 +00:00
Timothy Teakettle	132a3c9526	color non polychromic items	2020-12-08 19:29:34 +00:00
DeltaFire	69a1d6e603	oop	2020-12-08 16:32:34 +01:00
DeltaFire	86661a4fe0	aaaaaaaaaaaaaa	2020-12-08 16:30:09 +01:00
Lin	e38543ae48	Merge pull request #13736 from DeltaFire15/abductor-surgery-robotstuff ... Makes the experimental organ replacement surgery work on robots	2020-12-07 23:18:35 +00:00
timothyteakettle	43df7462d5	copy from old species	2020-12-07 23:03:28 +00:00
Timothy Teakettle	8846e69c42	ANOTHER ONE	2020-12-07 21:34:52 +00:00
Timothy Teakettle	ac9e383638	WOOPS ONE MORE DEBUG MESSAGE	2020-12-07 21:28:17 +00:00
DeltaFire	b186ec96ad	rune invisible to sillycones.	2020-12-07 22:19:30 +01:00
DeltaFire	73d3234882	buncha changes	2020-12-07 22:15:04 +01:00
DeltaFire	33e4486c53	Merge remote-tracking branch 'upstream/master' into heretic-tweaks	2020-12-07 21:18:11 +01:00
timothyteakettle	81eaa8a2b9	woops	2020-12-06 23:51:03 +00:00