856 Commits

Author	SHA1	Message	Date
BongaTheProto	5116acad15	Merge remote-tracking branch 'upstream/master'	2023-05-06 18:31:55 -05:00
SandPoot	7038059ab5	Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13	2023-05-06 10:47:06 -03:00
KrissKr0ss	66aa1cb05c	Revert "Merge pull request #15929 from JerryWester/revert-15894-modsuits" ... This reverts commit 48e713ff33, reversing changes made to efb2d19cb9.	2023-05-01 00:16:20 -05:00
BongaTheProto	4b547a3208	Merge remote-tracking branch 'upstream/master'	2023-04-08 15:49:43 -05:00
SandPoot	7cc1ecfa1e	(i'm being shot by those red arrows help)	2023-04-06 18:49:21 -03:00
BongaTheProto	acf6b87535	Merge remote-tracking branch 'upstream/master'	2023-02-24 01:39:26 -05:00
SandPoot	f0dcf824a7	Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13	2023-02-24 01:59:45 -03:00
SandPoot	b2f7fc5a9e	over action buttons also very cool you guy that hates my fancy hints, hope you know how to do everything	2023-02-24 01:07:27 -03:00
BongaTheProto	972df3f711	Merge remote-tracking branch 'upstream/master'	2023-02-16 16:30:59 -05:00
SandPoot	04eb7226e6	general better handling of code + interaction screen tip	2023-02-15 23:26:59 -03:00
SandPoot	072087ec14	Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13	2023-02-15 20:22:44 -03:00
BongaTheProto	3f376c1bb3	Merge remote-tracking branch 'upstream/master'	2023-02-13 19:36:05 -05:00
SandPoot	4a01b9f5e2	Re-UI-ing (just steals old skyrat) (#302) ... * send it * redefining counts as error, so goodbye	2023-02-13 00:22:01 -03:00
SandPoot	ed06e686e1	pushies.	2023-01-31 16:40:17 -03:00
BongaTheProto	86a005b590	Merge remote-tracking branch 'upstream/master'	2023-01-11 12:51:40 -05:00
SandPoot	03304ba2c8	Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13	2023-01-10 22:50:16 -03:00
Timothy Teakettle	c8fc27fc9c	Merge pull request #15930 from SandPoot/reskinning ... Update to reskinning	2023-01-11 01:00:35 +00:00
SandPoot	3b8d102fac	puts pda in the system to remove shitcode	2023-01-10 20:02:12 -03:00
SandPoot	d743096f8a	Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13	2023-01-09 17:50:19 -03:00
Jerry Wester	ae347f3399	Revert "MODsuits"	2023-01-08 17:30:26 -07:00
SandPoot	82eff346c7	Merge Upstream	2023-01-07 22:52:22 -03:00
PeriodicChaos	183b554ed3	modsuits part 1	2022-12-11 20:30:41 -07:00
BongaTheProto	e1cb9c8346	Merge remote-tracking branch 'upstream/master'	2022-09-27 23:19:10 -05:00
SandPoot	f039efca97	Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13	2022-09-27 01:19:55 -03:00
silicons	a8ef986ce5	Merge pull request #15848 from shellspeed1/full-auto-port-from-tg-Credit-to-Fikou ... Port of a bunch of stuff to update guns at this point because we have a bunch of stuff we are missing.	2022-09-23 16:27:03 -07:00
silicons	a1fc1e0377	Merge pull request #15855 from shellspeed1/borg-pda-addition ... Ports borg pdas from hyper. Credit to haha26315 for the orginal PR and BongaTheProto for their port to splurt.	2022-09-23 16:16:03 -07:00
BongaTheProto	9025f54d7a	Merge pull request #464 from ItsSelis/tgui-input-framework ... TGUI Input Framework	2022-09-20 10:27:32 -05:00
BongaTheProto	9cdaffc417	Merge remote-tracking branch 'upstream/master'	2022-09-18 23:40:20 -05:00
BongaTheProto	0d5f2ab542	Merge pull request #492 from Zirok-BYOND/miscfixes ... Miscfixes	2022-09-18 14:59:01 -05:00
SandPoot	cc9c36bd13	Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13	2022-09-17 22:48:51 -03:00
Hatterhat	1f0ad3e68c	its a lil janky but we take those (#15834) ... Co-authored-by: Hatterhat <Hatterhat@users.noreply.github.com>	2022-09-17 13:47:24 -07:00
shellspeed1	11ec2b89e0	borg pda	2022-09-17 02:40:37 -07:00
Zirok	b295e02087	Various harddel fixes from https://github.com/tgstation/tgstation/pull/60228/	2022-09-16 18:51:08 +02:00
shellspeed1	f2ed6a571c	this gets it to the point it compiles	2022-09-09 18:04:52 -07:00
shellspeed1	fbc80cf829	initial port	2022-09-09 00:29:20 -07:00
Zirok	3efd9fbf68	Various fixes, make things compile	2022-09-02 18:24:34 +02:00
Kylerace	5d2d68edc4	Cherry-pick the merge commit for tgstation PR 58991, implementing underlay Lighting ... Implements underlay lighting, turning lightin objects into a datum, for details see the tgstation PR.	2022-09-02 18:22:15 +02:00
ItsSelis	cb7e71a7b9	Added Prefs	2022-08-31 16:51:51 +02:00
BongaTheProto	6d385f2b2e	Merge remote-tracking branch 'upstream/master'	2022-06-07 19:10:13 -05:00
SandPoot	be1357bdb0	Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13	2022-06-07 17:29:38 -03:00
Lin	6f97ec2b1d	Merge pull request #15656 from deathride58/animfix ... Animation refresh - Fully restores animations broken by BYOND updates, some light animation-related tweaks, and more	2022-06-07 18:05:07 +00:00
BongaTheProto	ec12aeaabf	Merge remote-tracking branch 'upstream/master'	2022-06-05 02:00:30 -05:00
SandPoot	6bff4b4165	Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13	2022-06-05 01:38:42 -03:00
deathride58	1a918ed8db	animation refresh - huge unatomized bundle of fixes and tweaks to numerous animations in the game	2022-05-31 19:22:30 -04:00
deathride58	ee92230176	Moves newplayer button population to a dedicated proc, significantly reducing the hackiness involved for getting the agegate working proper	2022-05-30 22:08:49 -04:00
BongaTheProto	1761c288c1	Merge branch 'Sandstorm-Station:master' into master	2022-05-29 23:21:41 -07:00
SandPoot	8bb1c2b32a	Upload files	2022-05-30 01:31:54 -03:00
SandPoot	856850c1b1	Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13	2022-05-29 21:41:59 -03:00
deathride58	ace4eb6c8d	[S] blocks a freshly rediscovered aimbot exploit	2022-05-26 20:03:03 -04:00
BongaTheProto	98cc9e67f4	Merge branch 'master' into some-cool-things	2022-04-26 21:05:03 -05:00