cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2025-12-17 13:23:11 +00:00
Code Issues Packages Projects Releases Wiki Activity
53,604 Commits 55 Branches 0 Tags
901b93e534a880bb2b014dbbd5f80c149e6ec01a
Commit Graph

1356 Commits

Author SHA1 Message Date
WoolyAypa
8ebd985f4b fixar 2023-02-07 22:21:21 -03:00
WoolyAypa
524525c5f5 dull han 2023-02-07 12:03:17 -03:00
BongaTheProto
ab9d691f1a Merge remote-tracking branch 'upstream/master' 2023-01-09 16:59:38 -05: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
silicons
23327fa268 Merge pull request #15894 from JerryWester/modsuits 
MODsuits
 2023-01-07 14:07:28 -08:00
SandPoot
ad479f738e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-01-07 16:45:16 -03:00
SandPoot
42d4abc164 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-01-07 16:44:44 -03:00
SandPoot
183eaf8a68 come on, the signal positions! 2023-01-07 16:34:23 -03:00
SandPoot
c3d6816780 Merge pull request #15577 from Putnam3145/bring-beauty-back 
Adds beauty back
 2023-01-07 15:58:46 -03:00
BongaTheProto
8034d9fb22 Merge remote-tracking branch 'upstream/master' 2022-12-31 14:31:12 -05:00
SandPoot
d337852c68 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-12-28 16:56:04 -03:00
Hatterhat
f0a154106e no more titanium req 2022-12-19 08:33:59 -06:00
BongaTheProto
a04476b38d Merge remote-tracking branch 'upstream/master' 2022-12-16 20:39:53 -05:00
SandPoot
011dd2e817 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-12-16 16:47:19 -03:00
Lin
7d0c3df2ad Merge pull request #15755 from timothyteakettle/dullahan-2-electric-boogaloo 
dullahans 2: electric boogaloo
 2022-12-14 19:07:59 -07:00
Jerry Wester
19428e2579 revert bag dumping changes 2022-12-13 19:15:07 -07:00
Jerry Wester
f7ac3c7624 beeg commit 2022-12-11 20:32:35 -07:00
PeriodicChaos
183b554ed3 modsuits part 1 2022-12-11 20:30:41 -07:00
Timothy Teakettle
b7673e234f add no hunger no breath 2022-12-09 13:30:10 +00:00
BongaTheProto
79fa770ab3 Merge remote-tracking branch 'upstream/master' 2022-10-13 11:21:32 -05:00
SandPoot
5384cb9d4b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-10-12 22:25:25 -03:00
silicons
f7937e54e0 Merge pull request #15860 from shellspeed1/public-bounties 
Port of public bounties and the sales tagger from tg.
 2022-10-12 03:27:37 -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
shellspeed1
a55b2c4ff3 ports https://github.com/tgstation/tgstation/pull/56375. Credit to cacogen. 2022-09-20 20:05:59 -07:00
shellspeed1
b4f886d999 port of https://github.com/tgstation/tgstation/pull/49111 aka sales taggers, credit to ArcaneMusic 2022-09-18 20:55:22 -07:00
shellspeed1
91c095989a stuff 2022-09-16 17:55:10 -07:00
shellspeed1
1130a9341e now it actually works 2022-09-09 20:02:45 -07: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
timothyteakettle
2313a24918 Merge branch 'master' into dullahan-2-electric-boogaloo 2022-08-11 14:43:48 +01:00
Timothy Teakettle
b260794e54 Update dullahan.dm 2022-08-10 16:37:21 +01:00
Timothy Teakettle
e71686d8ac fixes 2022-08-09 11:59:10 +01:00
Timothy Teakettle
8ee01d0bc4 Update dullahan.dm 2022-08-09 11:08:52 +01:00
Timothy Teakettle
a9f77d9344 let it retry for up to a minute 2022-08-08 16:38:02 +01:00
Timothy Teakettle
529ada40ef auto retry 2022-08-08 16:36:15 +01:00
BongaTheProto
9e7c5033cc Merge remote-tracking branch 'upstream/master' 2022-08-07 21:42:16 -05:00
SandPoot
00dadda3df Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-08-07 23:15:57 -03:00
Putnam3145
b2d816b825 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into station_traits 2022-08-07 17:59:28 -07:00
Timothy Teakettle
9a8c356f24 slightly better 2022-08-08 00:17:56 +01:00
Timothy Teakettle
276143f513 Update dullahan.dm 2022-08-07 23:17:49 +01:00
Timothy Teakettle
d49b6d0779 ae 2022-08-05 22:22:29 +01:00
Timothy Teakettle
fdd66a2b10 gib people after their head is destroyed 2022-08-05 21:48:55 +01:00
Timothy Teakettle
6410c94244 Update dullahan.dm 2022-08-05 20:58:27 +01:00
Timothy Teakettle
a397402a2e local man can't spell 2022-08-05 18:19:43 +01:00
Timothy Teakettle
b4330b2f3d GOODBYE SPECIES, HELLO COMPONENT 2022-08-05 18:19:22 +01:00
Timothy Teakettle
b05f6e221d MIGRATIONS DELETIONS AND QUIRKS OH MY 2022-08-05 18:06:49 +01:00
Timothy Teakettle
818e564c92 stable 2022-08-05 15:44:40 +01:00