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-02-09 15:49:30 +00:00
Code Issues Packages Projects Releases Wiki Activity
58,023 Commits 55 Branches 0 Tags
master
Commit Graph

1064 Commits

Author SHA1 Message Date
Mosley
0d9eebd20c Merge remote-tracking branch 'upstream/master' 2025-04-24 17:03:15 -05:00
SandPoot
2d87780147 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2025-02-13 18:06:56 -03:00
SandPoot
56d972eb0b all sorts of fixes and updates, may break stuff 2025-02-09 02:09:28 -03:00
ariaworld
0601002cd1 Space update 2024-09-02 00:20:38 +02:00
ariaworld
d42c7a4f2a Merge remote-tracking branch 2024-08-29 14:42:55 +02:00
SandPoot
75d1a7d69c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2024-08-26 04:31:35 -03:00
SandPoot
dc08550162 push 2024-08-25 04:38:03 -03:00
SandPoot
a1905591f7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2024-08-24 23:49:10 -03:00
SandPoot
c07e94be66 push 2024-08-24 21:28:55 -03:00
SandPoot
bc0dc5ee02 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2024-08-12 19:54:43 -03:00
SandPoot
86faaee73e buh 2024-08-11 15:11:17 -03:00
SandPoot
b3e04bd75f aux_base ugliness 2024-08-11 14:31:27 -03:00
Ryu OrbWatcher
525d466413 Fixed the miner's explorer suit 2024-06-27 12:27:15 -05:00
MysteryMan21333
e2bbedbb64 Merge branch 'Mining-suit-fix' of https://github.com/MysteryMan21333/S.P.L.U.R.T-Station-13 into Mining-suit-fix 2024-04-30 21:04:01 -05:00
MysteryMan21333
37f8c1b79a V1.0 2024-04-30 21:02:58 -05:00
BongaTheProto
dbd4505372 Merge remote-tracking branch 'upstream/master' 2024-04-30 19:02:41 -05:00
SandPoot
91a9223df6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2024-04-25 17:08:42 -03:00
deathride58
0517ece12a fixes floor decals and other missing signal-added overlays by making sure things properly call parent update_icon 2024-04-24 22:30:25 -04:00
BongaTheProto
1e1fc329f8 Merge remote-tracking branch 'upstream/master' into upstream-merge 2024-04-13 14:12:39 -05:00
SandPoot
2e2528ee56 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2024-04-13 00:36:29 -03:00
SandPoot
4af0628c8b woo 2024-04-12 22:36:44 -03:00
BongaTheProto
78d4eaeaaa Merge pull request #1135 from liz-lavenza/fix/upstream-merge-fix 
Fix harddel issues with 515 upgrade PR
 2024-04-07 03:16:55 -05:00
Elizabeth Lavenza
aafce505f3 Fixes some actual harddels 2024-04-07 00:32:10 -04:00
BongaTheProto
dc057a41ad Merge branch 'master' into upstream-merge 2024-04-06 18:51:51 -05:00
Elizabeth Lavenza
6dcccb6a02 Fix kinetic crusher runtimes 2024-04-01 18:08:56 -04:00
BongaTheProto
b2e14a5393 Merge remote-tracking branch 'upstream/master' into upstream-merge 2024-03-24 17:02:38 -05:00
SandPoot
b76127c2d7 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2024-03-15 19:21:39 -03:00
SandPoot
676cb864b1 missed proc refs 2024-03-12 22:17:30 -03: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
d1b0e9ec9f Merge remote-tracking branch 'upstream/master' 2024-03-01 21:15:28 -05:00
ariaworld
93f0fb7e6c Fix a few hard-dels 2024-01-21 16:14:07 +01:00
SandPoot
0b990039e3 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2024-01-16 18:00:55 -03:00
BongaTheProto
8e8999fa08 Merge branch 'Sandstorm-Station:master' into master 2024-01-07 19:58:34 -05:00
SandPoot
46384d2a67 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2024-01-07 03:36:25 -03:00
SandPoot
003eec1850 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into update-to-action-buttons 2024-01-07 02:09:58 -03:00
SandPoot
76e7ffc80d push 2024-01-06 17:36:02 -03:00
SandPoot
c7a2565255 stop this nonsense 2024-01-05 00:28:56 -03:00
BongaTheProto
13cd269788 Merge remote-tracking branch 'upstream/master' 2023-12-25 14:28:51 -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
7b62dbe7bb ai + mech 2023-12-17 23:15:59 -03:00
BongaTheProto
c1c9fef224 Merge remote-tracking branch 'upstream/master' 2023-12-15 18:12:47 -05:00
SandPoot
8cdb82a23f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-12-12 22:06:13 -03:00
SandPoot
c36105ef88 holy hell 2023-12-07 23:08:17 -03:00
SandPoot
40f1d7401d procs 2023-11-29 22:40:13 -03:00
BongaTheProto
a257032907 Merge pull request #924 from Tsurupeta/banishing-of-harddels 
Banishing of harddels
 2023-08-15 00:41:11 -05:00
Tsurupeta
d4ec25e748 all else 2023-08-08 14:01:18 +03:00
K4rlox
22fa3b5ee4 modified: code/modules/mining/equipment/resonator.dm 2023-07-18 18:44:19 +03:00
K4rlox
cadccf56f1 modified: code/modules/mining/equipment/resonator.dm 2023-07-18 18:43:37 +03:00
K4rlox
76698153e9 nerfs the resonator 2023-07-18 18:42:15 +03:00
K4rlox
ca9be76445 modified: code/modules/mining/equipment/resonator.dm 2023-07-10 12:32:15 +03:00