 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 |
|
|
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 |
|
|
BongaTheProtoandGitHub
|
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 |
|
|
BongaTheProtoandGitHub
|
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 |
|
|
BongaTheProtoandGitHub
|
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 |
|
|
K4rlox
|
d8ada81472
|
new file: code/modules/mining/equipment/resonator.dm
|
2023-07-10 12:32:15 +03:00 |
|
|
K4rlox
|
d7274baab5
|
modified: code/modules/mining/equipment/resonator.dm
|
2023-07-10 12:27:32 +03:00 |
|
|
K4rlox
|
525a0421e0
|
modified: code/modules/mining/equipment/resonator.dm
|
2023-07-10 00:56:41 +03:00 |
|
|
K4rlox
|
3f40ec9fef
|
modified: code/modules/mining/equipment/resonator.dm
|
2023-07-03 00:12:58 +03:00 |
|
|
Comicao1
|
35be2259e1
|
Update mine_items.dm
|
2023-06-23 20:55:00 -03:00 |
|
|
Comicao1
|
12e78a689b
|
Update mine_items.dm
|
2023-05-31 18:57:04 -03:00 |
|
|
Comicao1
|
91f2d395c1
|
Qew
|
2023-05-27 03:59:00 -03:00 |
|
|
Comicao1
|
0473bfca9b
|
Update mine_items.dm
|
2023-05-08 03:17:00 -03:00 |
|
|
Comicao1
|
44f8522120
|
Requested
|
2023-03-22 17:34:10 -03:00 |
|
|
BongaTheProto
|
57a7a516e6
|
Merge remote-tracking branch 'upstream/master'
|
2023-03-06 22:43:10 -05:00 |
|
|
SandPoot
|
d63c2ebdd8
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-03-05 12:35:35 -03:00 |
|
|
zeroisthebiggayandGitHub
|
4d72fd3ddf
|
Update explorer_gear.dm
|
2023-02-20 22:53:26 -05:00 |
|
|
zerothebigboy
|
091d9ec00f
|
good
|
2023-01-30 00:01:22 -05:00 |
|
|
BongaTheProto
|
d6aa3acbd4
|
Merge remote-tracking branch 'upstream/master'
|
2023-01-09 17:08:06 -05:00 |
|