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

371 Commits

Author SHA1 Message Date
SandPoot
529cea6698 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-11-08 18:10:47 -03:00
LetterJay
10c90e06c1 Merge pull request #13661 from timothyteakettle/age-verification 
adds in-game age verification as an alternative to access requests
 2020-11-08 11:07:05 -06:00
SandPoot
b77a18d6c5 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-11-07 13:03:03 -03:00
silicons
77a1bdba0c Merge pull request #13630 from timothyteakettle/short-tall-quirks 
character size scaling
 2020-11-07 00:19:29 -07:00
Timothy Teakettle
e2ca7164b9 age verification 2020-11-06 21:00:14 +00:00
SandPoot
b28fce9ebb Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-10-28 13:36:59 -03:00
Timothy Teakettle
0fa83322a1 re-add slow stride but it defaults to disabled 2020-10-26 20:40:11 +00:00
Timothy Teakettle
4e6146898c fixes/config edits 2020-10-26 20:27:58 +00:00
Timothy Teakettle
2b00f2bb2f config values 2020-10-26 20:27:02 +00:00
Putnam
558d11bc73 Stringified the vote #defines for easier config stuff 2020-10-18 14:49:43 -07:00
SandPoot
cdbf96c70d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-10-15 13:47:29 -03:00
silicons
c3cdeb0507 fixes movespeed configurations (#13555) 
* Update config_entry.dm

* Update game_options.dm

* Update config_entry.dm

* Update code/controllers/configuration/config_entry.dm

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-10-15 13:53:21 +02:00
SandPoot
8aad78b784 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-10-11 02:44:06 -03:00
silicons
7f611a98e1 Merge remote-tracking branch 'citadel/master' into combat_rework_experimental 2020-10-10 22:23:22 -07:00
SandPoot
273ad286d5 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-10-10 14:43:38 -03:00
silicons
19f1e99a8c mass ports like 15 tg prs + counting (#13386) 
* changes

* ok

* changes

* sigh

* fixes

* changes

* fix

* fix

* alright

* fixes
git pus

* fix

* fix

* fix

* test

* ok

* Update code/modules/paperwork/ticketmachine.dm

Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>

* ok

* compile and other stuff

* ok

* fix

* fix

* Fix

* Update menu.dm

* Update view.dm

* Update preferences.dm

Co-authored-by: Letter N <24603524+LetterN@users.noreply.github.com>
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
 2020-10-10 12:20:33 +02:00
silicons
1b1efce556 Merge remote-tracking branch 'citadel/master' into combat_rework_experimental 2020-10-06 17:11:21 -07:00
Enric Gabriel
7df07d2859 Merge branch 'master' of upstream into master 2020-10-01 12:49:01 -03:00
silicons
822f1c9bf3 fix 2020-09-27 03:07:51 -07:00
silicons
2dddb2253e tweak 2020-09-21 21:03:28 -07:00
silicons
4ab064a50d fix 2020-09-21 20:58:33 -07:00
silicons
31791df2bd fixes 2020-09-21 20:38:43 -07:00
silicons
2c4dc4d1a9 ok 2020-09-21 19:08:21 -07:00
silicons
ddc7f10de7 fixes 2020-09-21 18:35:42 -07:00
silicons
7249fe058f config based 2020-09-21 17:36:30 -07:00
silicons
c5403b5ef4 fixes 2020-09-20 02:49:42 -07:00
timothyteakettle
c3bea5f77b wounds 2020-09-15 23:50:26 +01:00
timothyteakettle
7be15afb32 config 2020-09-15 23:20:11 +01:00
Enric Gabriel
c10471fac9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-30 01:42:29 -03:00
Letter N
afe32406c0 Merge remote-tracking branch 'origin/master' into TGUI-CHAT-TGUI-CHAT-TGUI-CHAT 2020-08-22 13:40:36 +08:00
Enric Gabriel
b0cf18fc5a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-20 13:29:24 -03:00
Letter N
3b7bca28b3 Functional* code 2020-08-20 13:50:33 +08:00
silicons
91484356c5 Merge pull request #13183 from SmArtKar/shuttle_hotfix 
Shuttle hotfix so now you can make huge shuttle things
 2020-08-19 21:03:58 -07:00
Letter N
90cb13f6af Merge remote-tracking branch 'origin/master' into TGUI-CHAT-TGUI-CHAT-TGUI-CHAT 2020-08-18 10:33:21 +08:00
SandPoot
66541bbe67 Adds tgstation's fix air for admins (#49) 2020-08-17 14:55:59 -03:00
Letter N
610e25beb7 oops updates asset cache 2020-08-17 20:51:05 +08:00
SmArtKar
e087845745 reee 2020-08-17 13:32:18 +03:00
Enric Gabriel
06496434a4 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-16 23:30:53 -03:00
SmArtKar
dd64dcc4ea Return of the King(and the limits) 2020-08-16 16:21:17 +03:00
SmArtKar
0a6eca818c Succesfull removal of shuttle limit 2020-08-16 15:59:31 +03:00
kiwedespars
eb8574d6d6 heretics from tg (with changes) 2020-08-10 19:17:26 -07:00
Enric Gabriel
372b486daf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-01 10:07:19 -03:00
Unknown
16722c47c3 CentCom Galactic Ban DB 2020-07-29 21:39:58 -05:00
Enric Gabriel
05593f84a0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-07-16 22:13:13 -03:00
Artur
5f9364c5f8 Merge remote-tracking branch 'Upstream/master' into TGUI-3.0 2020-07-13 16:20:54 +03:00
Enric Gabriel
beec77b17d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-07-11 20:04:30 -03:00
Lin
955d9fa0cc Merge pull request #12624 from Citadel-Station-13/policy 
policy configuration & support hooks for clone memory disorder
 2020-07-11 16:40:38 -05:00
Artur
280d3de6c3 Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-07-07 18:37:45 +03:00
Enric Gabriel
83522c8571 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-07-04 17:18:13 -03:00
Ghom
871993ce14 Merge pull request #12593 from silicons/autobunker 
adds verb to auto bunker override on linked servers
 2020-07-04 18:36:59 +02:00