Commit Graph

48081 Commits

Author SHA1 Message Date
BongaTheProto
2ad86e15c4 Merge remote-tracking branch 'upstream/master' 2022-01-22 16:33:08 -05:00
SPLURT Bot
c63748ebe6 Automatic changelog generation for PR #146 [ci skip] 2022-01-22 21:29:29 +00:00
BongaTheProto
41f5187657 Merge pull request #146 from Uso15/slutcurity-uniforms
Slutcurity uniforms
2022-01-22 16:28:21 -05:00
SandPoot
28cc02d653 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-01-22 17:18:15 -03:00
silicons
f3332f8607 Merge pull request #15470 from Putnam3145/trit-messed-up
Fixes trit/hydrogen fires to have right products
2022-01-22 04:38:11 -08:00
CitadelStationBot
efb26ee532 Automatic changelog generation for PR #15449 [ci skip] 2022-01-22 06:35:01 -06:00
silicons
f85d0dbda0 Merge pull request #15449 from Putnam3145/gib-podpeople
Allows pod people to be made using other fluids
2022-01-22 04:34:59 -08:00
CitadelStationBot
afd1147e3a Automatic changelog generation for PR #15419 [ci skip] 2022-01-22 06:34:44 -06:00
silicons
a7993cd916 Merge pull request #15419 from Putnam3145/funny-atmos-event
Adds an event that speeds up/slows down atmos
2022-01-22 04:34:42 -08:00
CitadelStationBot
0390e5e221 Automatic changelog generation for PR #15324 [ci skip] 2022-01-22 06:34:30 -06:00
silicons
2b726d7670 Merge pull request #15324 from Trilbyspaceclone/ashtree
Ashen tree!
2022-01-22 04:34:28 -08:00
Uso15
1ab4ce7faf Slutcurity uniforms
Ported Security slutty skirts/stripper outfit from Hyperstation, fully modularized
2022-01-21 19:54:50 -06:00
Changelogs
f02c54f31d Automatic changelog compile [ci skip] 2022-01-22 00:27:40 +00:00
Changelogs
6dd2022b08 Automatic changelog compile [ci skip] 2022-01-22 00:21:19 +00:00
Changelogs
92f90d8c18 Automatic changelog compile [ci skip] 2022-01-22 00:19:59 +00:00
SPLURT Bot
1efb552204 Automatic changelog generation for PR #144 [ci skip] 2022-01-21 23:46:39 +00:00
SPLURT Bot
5f464352f5 Automatic changelog generation for PR #145 [ci skip] 2022-01-21 23:46:25 +00:00
BongaTheProto
0daface294 Merge pull request #144 from NopemanMcHalt/boatcloaks
[MODULAR] Boatcloak port
2022-01-21 18:45:30 -05:00
BongaTheProto
87a71a843c Merge pull request #145 from NopemanMcHalt/loweffort-bladesec
[NON-MODULAR] Low-Effort Security version of Bladeborg (Suggestion 214)
2022-01-21 18:45:20 -05:00
Anonymous
69238cebb2 Low-Effort BladeWolf Sec module 2022-01-21 16:12:38 +03: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
29f74e1569 Merge pull request #143 from StrangeWeirdKitten/Fixb
Fixes Hilbert Deleting
2022-01-21 03:30:49 -05:00
StrangeWeirdKitten
0d4006ffe3 Update hilbertshotel.dm 2022-01-21 01:19:25 -07:00
SPLURT Bot
af1666dc83 Automatic changelog generation for PR #142 [ci skip] 2022-01-21 07:58:29 +00:00
SPLURT Bot
038c99677c Automatic changelog generation for PR #141 [ci skip] 2022-01-21 07:58:15 +00:00
BongaTheProto
1c5864eb61 Merge branch 'Sandstorm-Station:master' into master 2022-01-21 02:57:48 -05:00
BongaTheProto
e532715bdb Merge pull request #142 from radar651/Hailer
Hailer port
2022-01-21 02:57:26 -05:00
BongaTheProto
8bdf3fe59a Merge pull request #141 from NopemanMcHalt/moreborgs
[NON-MODULAR] More Borgs
2022-01-21 02:56:54 -05:00
BongaTheProto
696cb202de Merge branch 'master' of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13 2022-01-20 19:41:24 -05:00
Changelogs
b0a2c983a0 Automatic changelog compile [ci skip] 2022-01-21 00:28:00 +00:00
BongaTheProto
4ac125e1d3 Update belly.dm
No more popped bellies
2022-01-20 19:22:11 -05:00
Changelogs
5d8abf6b91 Automatic changelog compile [ci skip] 2022-01-21 00:21:28 +00:00
Changelogs
3a41c0a5e7 Automatic changelog compile [ci skip] 2022-01-21 00:20:15 +00: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
675da4ad9a Borg Icons stage 3
Who let dog(borg)s out?
2022-01-20 18:05:44 +03:00
Anonymous
6929e7dd6a Borg Icons stage 2
Normal borg sprites implemented.
2022-01-20 15:29:20 +03:00
Anonymous
ddefb88275 Borg Icons stage 1 2022-01-20 13:40:47 +03:00
SPLURT Bot
76744081c0 Automatic changelog generation for PR #138 [ci skip] 2022-01-20 01:40:50 +00: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
4437f8bc27 Merge branch 'Sandstorm-Station:master' into master 2022-01-19 20:39:23 -05:00
Changelogs
4387c06efc Automatic changelog compile [ci skip] 2022-01-20 00:33:52 +00:00
Changelogs
7975a98a33 Automatic changelog compile [ci skip] 2022-01-20 00:28:38 +00:00
Changelogs
7cff28f240 Automatic changelog compile [ci skip] 2022-01-20 00:26:41 +00:00
BongaTheProto
10c79f6ba3 Merge remote-tracking branch 'upstream/master' 2022-01-19 16:54:01 -05:00
SandPoot
2f662b9c58 Update FUNDING.yml
F
2022-01-19 18:38:03 -03:00
BongaTheProto
425d982354 Update operative.dm 2022-01-19 16:26:22 -05:00
BongaTheProto
3fa9c9916f Merge branch 'Sandstorm-Station:master' into master 2022-01-19 15:39:16 -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