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 2026-08-28 15:17:00 +01:00
Code Issues Packages Projects Releases Wiki Activity
55,761 Commits 55 Branches 0 Tags
interactions-issues
Commit Graph
781 Commits
Author SHA1 Message Date
zerothebigboy 359c778955 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum 
# Conflicts:
#	code/modules/ninja/suit/ninjaDrainAct.dm
 2021-05-02 22:47:39 -04:00
SandPoot 13e0116894 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-04-29 11:09:28 -03:00
SandPoot 90661d3687 upload files 2021-04-24 21:37:01 -03:00
SandPoot 5bb6078def upload files 2021-04-22 20:39:21 -03:00
SandPoot 4cd5c31044 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-04-21 19:36:12 -03:00
siliconsandGitHub 75e3f5eae6 Merge pull request #14573 from zeroisthebiggay/eatshitanddie 
pov: you're an enraged miner main that hates having their loot require a modicum of effort (ports tg ash drake)
 2021-04-21 13:50:46 -06:00
SandPoot 0165c4a7c0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-04-10 12:34:59 -03:00
siliconsandGitHub cbd7e0de6a Merge pull request #14418 from LetterN/perlin-genny 
Updates openspace & enables perlin generation on alvaland & icebox/snaxi
 2021-04-06 04:10:00 -06:00
zerothebigboy f1b45b3839 eatshitanddie 2021-04-05 21:55:17 -04:00
Blue Wildrose 3d8f8ffe27 Bringin' back the ding 2021-04-02 02:19:19 -07:00
zerothebigboy 01d92230a3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum 
# Conflicts:
#	icons/mob/clothing/mask.dmi
 2021-03-16 19:19:12 -04:00
Letter N 935e46b492 The Mapping Update 
Cleans up the map (again)
Makes mining code more better
 2021-03-12 12:11:35 +08:00
SandPoot 20509121b8 Merge branch 'master' of https://github.com/Sandstorm-Station/Sandstorm-Station-13; branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-03-08 14:07:57 -03:00
SandPoot af6a8bdd5c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-03-03 12:05:27 -03:00
Letter N a87e4533e5 support for tgs4 noconfigs needed*** 2021-03-03 17:33:14 +08:00
Letter N 754c24748e Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-03-03 17:09:01 +08:00
Letter N 7d39949a2f Merge remote-tracking branch 'origin/master' into rustsql 2021-02-19 12:38:32 +08:00
Letter N 501d33cddd agony 2021-02-19 10:32:24 +08:00
Letter N de67720a0a icons should exist 2021-02-14 11:39:56 +08:00
Letter N 8a0c932d55 oops! All Refactors! 2021-02-12 11:07:58 +08:00
zerothebigboy 85886f563f f 2021-02-08 16:59:54 -05:00
Letter N f87aa0ac5b toast. And DiscoFox™️ 2021-02-08 18:46:05 +08:00
SandPoot 28e87a5db5 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-01-28 21:57:36 -03:00
Timothy Teakettle 938b924a37 yes 2021-01-28 11:12:27 +00:00
SandPoot e0efc2e85d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-01-26 03:08:43 -03:00
Timothy Teakettle 8569c40ce5 Update adminpm.dm 2021-01-21 22:23:48 +00:00
Timothy Teakettle 401e6a7690 test 2021-01-21 20:17:25 +00:00
Letter N 125cd17cee Merge remote-tracking branch 'origin/master' into rustsql 2021-01-20 15:40:41 +08:00
SandPoot 0d1a6c73fc Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-01-19 23:31:15 -03:00
silicons e680d58a03 fixes 2021-01-09 14:56:29 -08:00
silicons ddad368d6a Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-08 00:33:57 -08:00
SandPoot 20c9518c4f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-01-06 20:12:09 -03:00
Artur 9e16df56aa Ding for prayers 2021-01-04 23:23:55 +02:00
Letter N cd5d558fad safety? what's that? 
* maybe table-breaking change
 2021-01-04 11:57:12 +08:00
Letter N 56fb81d02c Immursive Audio 2 2020-12-24 11:06:49 +08:00
SandPoot 766493cc16 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-12-22 18:03:33 -03:00
DeltaFireandGitHub c37bb9cc2a Merge pull request #13842 from Citadel-Station-13/silicons-patch-35 
deletes a tiny segment of dead code
 2020-12-22 17:56:13 +01:00
DeltaFireandGitHub 65c14cf289 Merge pull request #13537 from silicons/permissions 
support update for event manager permissions
 2020-12-22 16:12:03 +01:00
siliconsandGitHub 458f0e4491 Update deadsay.dm 2020-12-21 21:51:52 -07:00
SandPoot e21c089e20 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-11-27 18:43:19 -03:00
uomo91 cfaa988217 Merge master and fix newline conflict. 2020-11-19 17:12:19 -06:00
SandPoot af0f6e7bd0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-11-18 23:12:54 -03:00
Putnam3145andGitHub 9d300ade35 Merge pull request #13677 from silicons/newlines 
Adds missing EOF newlines
 2020-11-18 17:50:38 -08:00
uomo91 6b85ab5c01 Individual logging code. 2020-11-16 01:40:48 -06:00
DeltaFire 3e19557e8f and more fixes. 2020-11-14 19:38:39 +01:00
silicons 803bff4e5f funny 2020-11-12 23:34:42 -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
siliconsGitHubLetter NPutnam3145
 		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 8e83dcd697 event permissions 2020-10-07 14:43:53 -07:00
SandPoot 08f8360f31 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-10-06 23:10:33 -03:00