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-30 16:16:47 +01:00
Code Issues Packages Projects Releases Wiki Activity
56,903 Commits 55 Branches 0 Tags
some-updates
Commit Graph
166 Commits
Author SHA1 Message Date
BongaTheProto 1e1fc329f8 Merge remote-tracking branch 'upstream/master' into upstream-merge 2024-04-13 14:12:39 -05:00
SandPoot 002a4c31c1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2024-04-12 22:06:15 -03:00
SandPoot ca8ce67cd6 mail 2024-04-10 20:54:04 -03:00
SandPoot b76127c2d7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2024-03-15 19:21:39 -03:00
BongaTheProto 1883c47d5c basic ref regex 
makes the proc calls compatible with 515
 2024-03-11 19:46:05 -05:00
SandPoot a65f323734 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into proc-define-shit 2024-03-08 19:10:22 -03:00
BongaTheProto 26c86a9152 followup 
I believe those are the only name changes
 2023-12-25 14:29:23 -05:00
SandPoot be37603291 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-12-23 13:28:41 -03:00
SandPoot 27bdd4b732 aiModule > ai_module 2023-12-17 23:20:43 -03:00
SandPoot 40f1d7401d procs 2023-11-29 22:40:13 -03: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 33889870c9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into station_traits 2022-05-17 13:22:40 -07:00
SandPoot 05349c27e9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-04-15 23:43:43 -03:00
SandPoot 586a035132 Update files 2022-04-06 18:41:31 -03:00
Putnam3145 6199aa4d60 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into station_traits 2022-03-30 12:35:12 -07:00
SandPoot 28cc02d653 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-01-22 17:18:15 -03:00
Putnam3145 c392b7c3fb Allows pod people to be made using other fluids 2021-12-31 14:36:55 -08:00
Putnam3145 629ce5bea6 Station traits 2021-12-08 16:17:35 -08:00
SandPoot ecee82ed75 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-10-12 12:55:02 -03:00
Hatterhat 1d005db9a8 THE YEEHAW UPDATE 2021-09-30 23:10:33 -05:00
SandPoot 4b1df1bfb3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-09-13 10:18:55 -03:00
zerothebigboy ccfde52b0d code 2021-09-02 23:45:03 -04:00
SandPoot d863f9f437 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-06-27 15:54:58 -03:00
Putnam 3b25f3e199 Started expanding auxgm a bit 2021-06-10 04:40:23 -07:00
Putnam 86177c51c4 auxgm part 1 
see also https://github.com/Baystation12/Baystation12/blob/dev/code/modules/xgm/xgm_gas_data.dm
 2021-06-08 09:54:28 -07: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 dedb0cb62e Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-19 04:24:42 -07:00
SandPoot 67ad6cbbb8 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-01-15 19:03:13 -03:00
The0bserver 1b469bdfda The power of overwriting... 2021-01-14 01:03:48 -05:00
Letter N a808f805d4 ASYNC EVERYTHING! 2020-12-21 16:24:51 +08:00
Letter N cf692e8426 subsystem upgrades 2020-12-14 15:28:59 +08:00
SandPoot af0f6e7bd0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-11-18 23:12:54 -03:00
silicons 803bff4e5f funny 2020-11-12 23:34:42 -07:00
SandPoot b28fce9ebb Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-10-28 13:36:59 -03:00
Ghommie f49f72338f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit841 2020-10-25 15:01:57 +01:00
Ghommie 90c4cb2022 Here I fix a few issues. 2020-10-25 14:50:42 +01:00
SandPoot 7495575a6a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-10-23 11:52:46 -03:00
Ghommie c0f3317c01 mime/clown masks' face concealment altclick toggle. Plasmaman helmets' welding visors & smileys port. 2020-10-16 20:27:09 +02:00
Enric Gabriel 7898f1fe3e Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-08-16 23:24:11 -03:00
silicons 01dd2f389b Merge branch 'pr-13067' 2020-08-16 18:38:13 -07:00
SandPootandGitHub 518c70e6ed Some Cit reverts and skyrat features. (#46) 2020-08-15 13:29:50 -03:00
Putnam 467f66b2a6 Removed crocin/hexacrocin. 2020-08-08 00:46:30 -07:00
Hatterhat 6f754188ac funny guns go pew 2020-08-07 18:02:33 -05:00
siliconsandGitHub 267186a5d3 Merge pull request #12646 from Chiirno/emi 
[READY] Alt-click cigarette pack functionality added to pill bottles.
 2020-07-20 16:15:38 -07:00
Putnam a625d6562b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into putnamos-for-real 2020-07-08 22:02:03 -07:00
Cirno 020da9fa07 i hope this works 2020-07-04 15:47:38 -03:00
kappa-samaandGitHub cfc14a04f1 Merge branch 'master' into patch-28 2020-07-01 07:48:46 -04:00
kappa-samaandGitHub 5c7c300bf0 these do nothing 2020-07-01 04:58:44 -04:00
YakumoChenandGitHub 4c460278b4 removes improv handgun spawns 2020-07-01 08:52:09 +00:00
timothyteakettle 76b5557e1e bunch of grammar corrections 2020-06-27 02:12:44 +01:00