526 Commits

Author	SHA1	Message	Date
Pin-alternative	9e377c644b	Merge remote-tracking branch 'upstream/master' into cursed	2022-08-23 07:41:40 +10:00
BongaTheProto	66026ccc07	Merge remote-tracking branch 'upstream/master'	2022-08-16 11:05:20 -05:00
SandPoot	606d50715b	just quickly makes the machine say the correct acc	2022-08-15 23:19:23 -03:00
Pin-alternative	32018d15dc	Merge remote-tracking branch 'upstream/master' into cursed	2022-08-02 10:26:30 +10:00
Turtle567	482a2a3374	Fixed typo ... Chaplain alternate job title, "Bichop" is now "Bishop"	2022-07-26 19:41:11 -05:00
BongaTheProto	6398d42cad	oop! modularize	2022-07-26 00:13:15 -05:00
BongaTheProto	217a4f0dac	Merge pull request #413 from Turtle567/master ... Buffed Hiero Club, Chipped King Goat	2022-07-25 23:59:07 -05:00
Turtle567	4f9a50b2c7	Buff Hiero Club, Chipped King Goat ... Added +10 damage to all of the hierophant clubs attacks and raised their cooldown by a few seconds, this was needed as the hierophant club was hot ass previously. Brought the King Goat to the vet and chipped him, he can now be found on any GPS with the "Regal Signal"	2022-07-25 16:47:28 -05:00
Pin-alternative	5c44cad61e	Merge remote-tracking branch 'upstream/master' into cursed	2022-07-25 20:35:54 +10:00
BongaTheProto	b074c85078	Updates tea paths for hydration (#261)	2022-07-24 14:30:05 -03:00
BongaTheProto	75189180b4	Update drink_reagents.dm	2022-07-24 12:15:50 -05:00
Pin-alternative	58eac01841	Merge remote-tracking branch 'upstream/master' into cursed	2022-07-17 20:57:03 +10:00
BongaTheProto	8edee48740	Merge remote-tracking branch 'upstream/master'	2022-07-15 18:57:20 -05:00
SandPoot	abc70a16dd	kills possible timer subsystem killer and stupid code that doesn't stop overflowing overlays for **** sake	2022-07-15 20:04:42 -03:00
Pin-alternative	7b278b1f81	paren	2022-07-05 20:45:54 +10:00
Pin-alternative	ba1c639b58	Merge remote-tracking branch 'upstream/master' into cursed	2022-07-05 20:42:15 +10:00
Pin-alternative	50245ec870	mlem	2022-07-05 20:38:02 +10:00
BongaTheProto	45a1b8d623	Merge branch 'Sandstorm-Station:master' into master	2022-07-02 12:33:19 -07:00
SandPoot	4037765e4c	turns out this was wrong, cool!	2022-07-02 13:14:32 -03:00
Pin-alternative	55068b24f0	Merge remote-tracking branch 'upstream/master' into cursed	2022-06-30 14:55:06 +10:00
Pin-alternative	d58455d082	doin	2022-06-27 10:56:30 +10:00
Pin-alternative	7f4f83e082	needed changes	2022-06-25 20:43:09 +10:00
Pin-alternative	203f21c3d6	things	2022-06-25 18:11:35 +10:00
Pin-alternative	254a5350aa	updatess	2022-06-24 21:20:17 +10:00
Pin-alternative	f59bb6032e	get this stuff done	2022-06-23 20:07:12 +10:00
BongaTheProto	385b4efc5d	Merge branch 'master' into pr/340	2022-06-20 01:25:23 -05:00
Pin-alternative	407989f08b	Merge remote-tracking branch 'upstream/master' into cursed	2022-06-14 19:43:07 +10:00
BongaTheProto	03f4c65fc4	Merge remote-tracking branch 'upstream/master'	2022-06-11 23:25:29 -05:00
SandPoot	07a4c5c12b	Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13	2022-06-11 04:54:12 -03:00
AshTheDerg	8ccd6dec67	Peacekeeper Redo	2022-06-10 23:52:22 -04:00
Pin-alternative	79ab402216	Merge remote-tracking branch 'upstream/master' into cursed	2022-06-10 07:45:46 +10:00
BongaTheProto	6d385f2b2e	Merge remote-tracking branch 'upstream/master'	2022-06-07 19:10:13 -05:00
SandPoot	78b4d94c96	Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13	2022-06-07 17:00:44 -03:00
Pin-alternative	64cbd81e9c	Merge remote-tracking branch 'upstream/master' into cursed	2022-06-07 17:10:33 +10:00
BongaTheProto	2e8d1a3566	fixes tea	2022-06-04 21:22:42 -05:00
BongaTheProto	8b7fa8233c	emotes and quirks ... ok maybe it happened... but 40 votes? in only 2 days??	2022-06-04 18:46:02 -05:00
BongaTheProto	53222f62a3	Merge remote-tracking branch 'upstream/master'	2022-06-04 13:34:52 -05:00
BongaTheProto	6b5aa32aa3	merge followup	2022-06-04 13:26:34 -05:00
BongaTheProto	04d9c7d167	Merge remote-tracking branch 'upstream/master'	2022-06-04 13:25:54 -05:00
SandPoot	5517d4a92c	fix runtime	2022-06-04 08:05:43 -03:00
SandPoot	461bfc3f9c	Fixing some stuff about sizecode (#257)	2022-06-03 19:45:19 -03:00
Pin-alternative	b3b70bb319	Merge remote-tracking branch 'upstream/master' into cursed	2022-05-30 20:09:20 +10:00
Pin-alternative	c0f224efff	some more crap	2022-05-28 20:18:09 +10:00
BongaTheProto	5a7218474b	Merge branch 'master' into prefs-update	2022-05-21 18:48:58 -05:00
BongaTheProto	93bd50839e	Merge branch 'master' of https://github.com/ProbablyCarl/S.P.L.U.R.T into pr/332	2022-05-21 18:02:22 -05:00
BongaTheProto	e2c11cc474	modularize ... ඞ	2022-05-21 17:57:28 -05:00
BongaTheProto	c0530b3650	Merge branch 'master' into prefs-update	2022-05-19 10:48:20 -05:00
BongaTheProto	2a481ecea8	Merge branch 'Sandstorm-Station:master' into master	2022-05-19 08:42:54 -07:00
SandPoot	d0022f08bc	No.	2022-05-19 11:57:25 -03:00
BongaTheProto	3df6ff68cf	Merge branch 'master' into prefs-update	2022-05-18 21:07:24 -05:00