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-25 13:46:46 +01:00
Code Issues Packages Projects Releases Wiki Activity
55,761 Commits 55 Branches 0 Tags
interactions-issues
Commit Graph
1024 Commits
Author SHA1 Message Date
SandPoot 123de14009 upload files 2021-02-18 15:05:39 -03:00
SandPoot f738023097 Revert "Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing" 
This reverts commit 2e29f30fdf, reversing
changes made to 724910cfab.
 2021-02-18 15:04:46 -03:00
SandPoot cf2e70671a upload files 2021-02-18 14:47:10 -03:00
Letter N de67720a0a icons should exist 2021-02-14 11:39:56 +08:00
Letter N 5db87b9065 more updates! 2021-02-12 17:52:59 +08:00
Letter N 6286d40082 code works 2021-02-12 17:26:08 +08:00
SandPoot 8996930bdf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-02-04 20:40:45 -03:00
keronshb 68b65c3f93 Fixes some error, re adds knockdown 
should prevent item drops
 2021-01-30 16:19:09 -05:00
keronshb 8a75d59db2 Meathook tweaks 
Changes some values to make it a bit more fair.
 2021-01-30 15:59:59 -05: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 6d6b232afe i hate shitcoders 2021-01-27 20:33:14 +00:00
SandPoot c15a3b7a4e changes some comments and var paths to be better? 2021-01-19 13:01:45 -03:00
SandPoot e10c783cf0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-01-13 20:59:40 -03:00
kappa-sama c751f114aa finally 2021-01-12 01:42:55 -05:00
SandPoot 168799038d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-01-04 02:05:26 -03:00
siliconsandGitHub 697619856c Merge pull request #13859 from timothyteakettle/unlockable-loadout-items 
unlockable loadout items
 2021-01-03 18:07:18 -07:00
Timothy Teakettle 813e0f4c79 Merge remote-tracking branch 'upstream/master' into unlockable-loadout-items 2021-01-01 22:30:04 +00:00
SandPoot 6b7359aa6a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2021-01-01 15:19:56 -03:00
SandPootGitHubDeltaFire
 		a0e95b7c3d Update code/modules/mining/ores_coins.dm 
Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
 2020-12-31 16:59:33 -03:00
SandPoot 1fa828a3f7 upload files 2020-12-30 13:57:10 -03:00
Timothy Teakettle c3e9cdd9a5 finale 2020-12-26 23:09:19 +00:00
SandPoot 766493cc16 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-12-22 18:03:33 -03:00
Artur d72617e7d7 Fixes mint machine 2020-12-22 12:35:21 +02:00
SandPoot c585095ba5 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-12-04 12:29:55 -03:00
The0bserver 4559a153c3 Map Tweak 2020-11-27 16:51:55 -05:00
The0bserver 884fbd0a52 found you. 2020-11-27 03:45:08 -05:00
SandPoot 9ef37ce51b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-11-23 13:51:04 -03:00
SandPoot 488a0c5a69 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-11-21 22:46:01 -03:00
siliconsandGitHub 75d807df4e Merge pull request #13694 from TheObserver-sys/PublicMiningRevival 
Local Assistant man can now bash rock again!*
 2020-11-21 18:25:13 -07:00
SandPoot af0f6e7bd0 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-11-18 23:12:54 -03:00
The0bserver 6d1ace27f7 Initial Commit: Mapping is painful 2020-11-18 00:38:35 -05:00
silicons 803bff4e5f funny 2020-11-12 23:34:42 -07:00
SandPoot 7c3bbd127d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-11-04 22:47:02 -03:00
DeltaFire15andGitHub 91584053f5 Fixes a bunch of fallout from the tgui PR (#13648) 
* screamies

fixes a bunch of fallout from the tgui PR.. probably

* Empty commit to poke travis
 2020-11-01 21:59:22 +01:00
SandPoot b28fce9ebb Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2020-10-28 13:36:59 -03:00
siliconsandGitHub 1baa3013b3 Merge pull request #13626 from zeroisthebiggay/GOD 
[SALT] MAKES MEGAFAUNA ITEMS LAVAPROOF (LIKE THE LAVA STAFF)
 2020-10-28 07:53:44 -07:00
Ghommie 90c4cb2022 Here I fix a few issues. 2020-10-25 14:50:42 +01:00
zeroisthebiggayandGitHub 2c278ba370 A 
A
 2020-10-25 05:34:53 -04:00
zeroisthebiggayandGitHub 5eec2b76f5 OK MAYBE NOT INDESTRUCTIBLE 
OK
 2020-10-25 05:34:24 -04:00
zerothebigboy 6577aaac91 FRUSTRATION 2020-10-25 05:30:06 -04: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
Hatterhat 4195f96876 glaive daggers squashed 2020-10-03 14:32:19 -05:00
Enric Gabriel 7df07d2859 Merge branch 'master' of upstream into master 2020-10-01 12:49:01 -03:00
siliconsandGitHub 8b36cf6f64 Merge pull request #13375 from timothyteakettle/emp-rework 
the emp rework (emp severity reduces as you move from epicentre, severity is 1-100)
 2020-10-01 03:01:18 -07:00
Timothy TeakettleandGitHub 106b8ccead Merge branch 'master' into heterochromia 2020-09-24 22:09:03 +01:00
Enric Gabriel 4de9baf690 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-09-21 14:10:28 -03:00
Artur 435565f1d8 Merge remote-tracking branch 'origin/master' into TGUI_Updoot 2020-09-21 00:16:12 +03:00
Enric Gabriel 0b427c9f6f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into master 2020-09-15 23:32:38 -03:00
DeltaFire 9e3710bb51 kev request 
malf disk gone from the /misc chest type
 2020-09-11 23:19:55 +02:00
timothyteakettle d2f4d675a4 fuck 2020-09-10 03:55:24 +01:00