1420 Commits

Author	SHA1	Message	Date
Anonymous	e962df9df5	Modularization	2022-01-23 01:34:39 +03:00
BongaTheProto	41f5187657	Merge pull request #146 from Uso15/slutcurity-uniforms ... Slutcurity uniforms	2022-01-22 16:28:21 -05:00
Uso15	1ab4ce7faf	Slutcurity uniforms ... Ported Security slutty skirts/stripper outfit from Hyperstation, fully modularized	2022-01-21 19:54:50 -06:00
Anonymous	4e02c56ab7	Boatcloak port	2022-01-21 13:38:44 +03:00
BongaTheProto	e036e00701	made fix modular ... :3	2022-01-21 03:33:11 -05:00
BongaTheProto	e532715bdb	Merge pull request #142 from radar651/Hailer ... Hailer port	2022-01-21 02:57:26 -05:00
radar651	3bd65390d0	Hailer port ... Ported the hailer	2022-01-20 16:50:10 -06:00
Anonymous	af9c71186c	RoboMaids! ... Existed in the old (pre-tg) skyrat code.	2022-01-20 21:28:52 +03:00
Anonymous	6929e7dd6a	Borg Icons stage 2 ... Normal borg sprites implemented.	2022-01-20 15:29:20 +03:00
BongaTheProto	1a5ab8a5e8	Merge pull request #138 from radar651/master ... Suggestion 48, adding in more Non-laser weapons	2022-01-19 20:39:45 -05:00
BongaTheProto	183429b9db	just because I set up an alias lol ... alias for the verify command if you need it :33333333333333	2022-01-19 15:36:51 -05:00
BongaTheProto	00532beeea	Merge branch 'master' into pr/138	2022-01-19 12:51:57 -05:00
BongaTheProto	adc469ae71	icons fixed	2022-01-19 12:49:24 -05:00
BongaTheProto	370b6a0270	Merge pull request #128 from NullFag/i_will_become_back_my_money ... I will become back my money	2022-01-19 02:50:39 -05:00
BongaTheProto	87700527e3	part 1 fix	2022-01-19 01:55:30 -05:00
BongaTheProto	87d251d9a4	Revert "Revert "Merge remote-tracking branch 'upstream/master'"" ... This reverts commit 50d9931932.	2022-01-19 00:22:58 -05:00
radar651	50d9931932	Revert "Merge remote-tracking branch 'upstream/master'" ... This reverts commit 301708f667, reversing changes made to 172b207db7.	2022-01-18 23:20:05 -06:00
radar651	301708f667	Merge remote-tracking branch 'upstream/master'	2022-01-18 23:03:56 -06:00
radar651	150d3fa68f	Final update to 48 ... Fixed everything	2022-01-18 22:10:21 -06:00
radar651	e2720e4146	UPdate 48 updated ... An update to 48	2022-01-18 20:10:59 -06:00
SandPoot	9d7e903467	Update research_table.dm	2022-01-18 18:47:20 -03:00
SandPoot	435dea5bf9	Update research_table.dm	2022-01-18 17:18:49 -03:00
SandPoot	c8d46448ed	Update research_table.dm	2022-01-18 17:15:17 -03:00
SandPoot	3911629b38	Upload files	2022-01-18 17:11:54 -03:00
BongaTheProto	3d99fc40d3	Revert "Revert "Merge pull request #135 from SPLURT-Station/research-table"" ... This reverts commit 2a1ee13ad4.	2022-01-17 12:09:29 -05:00
BongaTheProto	3e96df735a	Revert "Revert "Merge pull request #136 from AyyRobotics/VaultTech"" ... This reverts commit 5e044b84fa.	2022-01-17 12:08:38 -05:00
BongaTheProto	bfe4755cda	Revert "Revert "Merge pull request #134 from jbox144/Huberts-Hotel"" ... This reverts commit 70b9a63348.	2022-01-17 12:08:29 -05:00
BongaTheProto	f33f094327	Revert "Revert "Merge pull request #133 from jbox144/TK-hugs"" ... This reverts commit 040be053fc.	2022-01-17 12:08:21 -05:00
BongaTheProto	f6dbf66e73	Revert "Revert "Merge pull request #132 from SPLURT-Station/milkjming"" ... This reverts commit a87acfb92f.	2022-01-17 12:08:15 -05:00
BongaTheProto	5e044b84fa	Revert "Merge pull request #136 from AyyRobotics/VaultTech" ... This reverts commit 20be3932b5, reversing changes made to cce6c7a07a.	2022-01-16 23:28:17 -05:00
BongaTheProto	70b9a63348	Revert "Merge pull request #134 from jbox144/Huberts-Hotel" ... This reverts commit 816f19e7b3, reversing changes made to 4f6583b791.	2022-01-16 23:28:00 -05:00
BongaTheProto	040be053fc	Revert "Merge pull request #133 from jbox144/TK-hugs" ... This reverts commit 4f6583b791, reversing changes made to 3852bca1bd.	2022-01-16 23:27:56 -05:00
BongaTheProto	a87acfb92f	Revert "Merge pull request #132 from SPLURT-Station/milkjming" ... This reverts commit 00e0fd04c3, reversing changes made to 8e70b187e5.	2022-01-16 23:27:26 -05:00
BongaTheProto	2a1ee13ad4	Revert "Merge pull request #135 from SPLURT-Station/research-table" ... This reverts commit 4df10fbc47, reversing changes made to 4e66b14f8c.	2022-01-16 18:03:00 -05:00
BongaTheProto	c771661a07	Update discord.dm	2022-01-16 18:00:01 -05:00
BongaTheProto	932eaf9a07	Revert "Revert "Merge pull request #135 from SPLURT-Station/research-table"" ... This reverts commit abdf56b326.	2022-01-16 16:24:25 -05:00
E	9b9925e3bb	Merge remote-tracking branch 'origin/master' into i_will_become_back_my_money	2022-01-16 17:12:17 +01:00
BongaTheProto	abdf56b326	Revert "Merge pull request #135 from SPLURT-Station/research-table" ... This reverts commit 4df10fbc47, reversing changes made to 4e66b14f8c.	2022-01-16 04:27:59 -05:00
BongaTheProto	21819cb113	Revert "Revert "Merge pull request #135 from SPLURT-Station/research-table"" ... This reverts commit bf75ae492c.	2022-01-16 02:05:53 -05:00
BongaTheProto	bf75ae492c	Revert "Merge pull request #135 from SPLURT-Station/research-table" ... This reverts commit 4df10fbc47, reversing changes made to 4e66b14f8c.	2022-01-15 23:09:49 -05:00
BongaTheProto	3256afa87a	ok?	2022-01-15 19:54:57 -05:00
BongaTheProto	96d330d8a0	trying again	2022-01-15 19:54:08 -05:00
SandPoot	0be2006542	Merge branch 'master' into research-table	2022-01-15 13:23:47 -03:00
SandPoot	730336145a	Upload files	2022-01-15 13:20:15 -03:00
BongaTheProto	00e0fd04c3	Merge pull request #132 from SPLURT-Station/milkjming ... mmmm milk	2022-01-15 04:13:56 -05:00
BongaTheProto	b61101c47b	cumcumcumcumcumcumcum ... cumcumcumcumcumcumcum	2022-01-15 04:03:34 -05:00
BongaTheProto	816f19e7b3	Merge pull request #134 from jbox144/Huberts-Hotel ... Fixes hilbert's hotel	2022-01-15 03:35:20 -05:00
jbox1	2c61c17124	Fixes hilbert's hotel ... Several changes to make everyone's favourite ERP lounge a little better	2022-01-15 17:02:26 +11:00
jbox1	f018662670	TK hugs ... Ported from AuStation, originally coded by yours truely. Simply lets players hug people telekinetically. And also headpat and boop.	2022-01-15 16:42:45 +11:00
E	ce4bef80f2	a	2022-01-14 22:48:17 +01:00