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-09 07:48:55 +00:00
Code Issues Packages Projects Releases Wiki Activity
41,745 Commits 55 Branches 0 Tags
a87e4533e583f0168e166bd509005bdc59d96908
Commit Graph

412 Commits

Author SHA1 Message Date
Letter N
754c24748e Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-03-03 17:09:01 +08:00
silicons
8989394742 Merge pull request #14270 from LetterN/rustsql 
Removes bsql 2
 2021-03-03 00:53:46 -07:00
Putnam
50c1a83c6a Adds a pAI policy config 2021-02-26 00:34:13 -08:00
Letter N
7d39949a2f Merge remote-tracking branch 'origin/master' into rustsql 2021-02-19 12:38:32 +08:00
Letter N
a2419f760a Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-12 13:18:09 +08:00
Letter N
8a0c932d55 oops! All Refactors! 2021-02-12 11:07:58 +08:00
silicons
34473c2ac7 fix 2021-01-20 16:55:19 -07:00
Letter N
125cd17cee Merge remote-tracking branch 'origin/master' into rustsql 2021-01-20 15:40:41 +08:00
silicons
89fd802b8f Update respawns.txt 2021-01-15 02:55:28 -07:00
Letter N
cd5d558fad safety? what's that? 
* maybe table-breaking change
 2021-01-04 11:57:12 +08:00
silicons
a6ae0fe5c2 ok 2020-12-26 20:56:48 -08:00
silicons
dafc6bf89f fix 2020-12-26 20:41:21 -08:00
DeltaFire
d3f30d21cf Merge pull request #13772 from silicons/respawn_system_2 
adds a respawn/return to lobby system, tweaks cryo to preserve everything instead of just ""important items""
 2020-12-22 17:40:33 +01:00
DeltaFire
65c14cf289 Merge pull request #13537 from silicons/permissions 
support update for event manager permissions
 2020-12-22 16:12:03 +01:00
silicons
ce10278c5a changes 2020-12-20 19:25:49 -07:00
silicons
ea21151462 LF 2020-12-20 18:55:45 -07:00
Putnam
5e8f76792e Readjusted weight; added min/max config options 2020-12-18 20:24:30 -08:00
silicons
e87cc27803 modifications 2020-12-15 07:21:06 -07:00
silicons
61c08ba422 fine 2020-12-13 02:29:53 -07:00
silicons
45a7c68da1 wow 2020-12-11 15:05:00 -07: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
silicons
77a1bdba0c Merge pull request #13630 from timothyteakettle/short-tall-quirks 
character size scaling
 2020-11-07 00:19:29 -07:00
silicons
2b273addf1 Merge pull request #13618 from Vynzill/mappinghell 
new jungle gateway map
 2020-11-07 00:19:11 -07:00
Timothy Teakettle
e2ca7164b9 age verification 2020-11-06 21:00:14 +00:00
Timothy Teakettle
e22bf8cf35 config 2020-10-26 20:46:40 +00:00
Vynzill
5f75151c51 junglemap 2020-10-21 17:00:28 -05:00
Putnam
558d11bc73 Stringified the vote #defines for easier config stuff 2020-10-18 14:49:43 -07:00
silicons
8e83dcd697 event permissions 2020-10-07 14:43:53 -07:00
Tupinambis
d2860b38c7 normalization 2020-10-01 18:46:31 -05:00
Tupinambis
f1bc1ccafb Merge branch 'master' into spooder 
# Conflicts:
#	code/modules/surgery/organs/eyes.dm

I have no idea if this will work
 2020-10-01 17:10:42 -05:00
Tupinambis
113b84ab50 Ports arachnids from WaspStation 2020-09-30 15:10:17 -05:00
timothyteakettle
3db878484d newline 2020-09-18 01:23:27 +01:00
timothyteakettle
3970724a29 wounds own config file yay 2020-09-18 01:23:18 +01:00
Letter N
2dd3d71b19 config&copypaste chang. 2020-08-20 16:36:24 +08:00
Letter N
3b7bca28b3 Functional* code 2020-08-20 13:50:33 +08:00
silicons
8dedcbcf76 Merge branch '13113' 2020-08-16 18:53:35 -07:00
zeroisthebiggay
5ad34ae298 Update spaceRuinBlacklist.txt 
oops i forgot configgies
 2020-08-15 17:06:02 -04:00
kiwedespars
eb8574d6d6 heretics from tg (with changes) 2020-08-10 19:17:26 -07:00
Putnam
9bb3ba5c5a added ethereals 2020-08-08 00:08:43 -07:00
Unknown
16722c47c3 CentCom Galactic Ban DB 2020-07-29 21:39:58 -05:00
Artur
5f9364c5f8 Merge remote-tracking branch 'Upstream/master' into TGUI-3.0 2020-07-13 16:20:54 +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
Letter N
f757e54db9 muh immursion 2020-07-08 15:59:44 +08:00
Artur
765ffdb1a1 Merge remote-tracking branch 'origin/master' into TGUI-3.0 2020-06-26 14:03:27 +03:00
silicons
ea57a84eb8 Create policy.txt 2020-06-25 18:04:23 -07:00
silicons
6db9b8c5d7 Update config.txt 2020-06-25 17:59:47 -07:00
Detective Google
28b0fb41e6 updates config on the repo to match changes (keeps everything blacklisted repo-side tho) 2020-06-22 20:39:14 -05:00
Artur
c41d2e78be Conflicts!!! 2020-06-22 17:39:24 +03:00
Detective Google
4e26916502 Merge remote-tracking branch 'upstream/master' into bald-bald-bald-bald-bald-bald-bald 2020-06-20 14:00:14 -05:00
Detective Google
0e1db216c8 Ports the reworked snowcabin and beach away missions by Jerry Derpinson (the baldy) 2020-06-17 19:33:14 -05:00