 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 |
|
|
SandPoot
|
1d6008397a
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2024-11-19 23:22:26 -03:00 |
|
|
Metis
|
f6af059a06
|
job titles
|
2024-11-02 03:16:16 -04: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
|
6083aeb1e3
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2024-05-17 21:49:16 -03:00 |
|
|
|
0a074ecb63
|
Purpose found
Co-authored-by: deathride58 <deathride58@users.noreply.github.com>
|
2024-05-17 21:38:45 -03:00 |
|
|
SandPoot
|
8d4b317800
|
poosh
|
2024-05-17 15:12:55 -03:00 |
|
|
SandPoot
|
2e2528ee56
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2024-04-13 00:36:29 -03:00 |
|
|
deathride58andGitHub
|
dd8c641520
|
Merge pull request #15486 from SandPoot/kills-cache
Solves issues with overlays by updating the whole subsystem
|
2024-04-12 23:31:54 -04:00 |
|
|
SandPoot
|
e40960a3a2
|
sadly necessary
|
2024-04-12 22:18:43 -03: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
|
91045350e5
|
overlay stuff
|
2024-04-12 22:01:03 -03:00 |
|
|
SandPoot
|
dfe90dfb61
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into pr/SandPoot/15486
|
2024-04-12 20:48:41 -03:00 |
|
|
SandPoot
|
ea41329544
|
some random math, if it's too low, or too high, change later
|
2024-04-10 23:01:39 -03:00 |
|
|
SandPoot
|
ca8ce67cd6
|
mail
|
2024-04-10 20:54:04 -03:00 |
|
|
SandPoot
|
c2df4281b9
|
Merge branch 'master' of https://github.com/Sandstorm-Station/Sandstorm-Station-13; branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2024-04-05 23:31:50 -03:00 |
|
|
SandPoot
|
68fa21d602
|
content
|
2024-04-05 17:57:54 -03:00 |
|
|
SandPoot
|
80666ec1dd
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2024-03-30 16:47:39 -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 |
|
|
SandPoot
|
676cb864b1
|
missed proc refs
|
2024-03-12 22:17:30 -03:00 |
|
|
Katherine Kiefer
|
fd29f9c902
|
initial
|
2024-03-09 21:16:02 +11: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 |
|
|
SandPoot
|
17362e5881
|
push em
|
2024-02-25 13:41:28 -03:00 |
|
|
SandPoot
|
0b990039e3
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2024-01-16 18:00:55 -03:00 |
|
|
SandPoot
|
c7a2565255
|
stop this nonsense
|
2024-01-05 00:28:56 -03:00 |
|
|
SandPoot
|
7eaef36e11
|
d k daunkey kaung
|
2024-01-03 22:42:03 -03:00 |
|
|
SandPoot
|
4e9ff44ee7
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-12-29 15:49:14 -03:00 |
|
|
deathride58andGitHub
|
ce1d757159
|
Merge pull request #16016 from SandPoot/throwing-update
[TESTMERGE] Updates firemanning, throwing stuff
|
2023-12-28 22:44:59 -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
|
b9a422ee2d
|
throw at mobs laying down
|
2023-12-18 14:07:25 -03:00 |
|
|
SandPoot
|
27bdd4b732
|
aiModule > ai_module
|
2023-12-17 23:20:43 -03:00 |
|
|
SandPoot
|
7b62dbe7bb
|
ai + mech
|
2023-12-17 23:15:59 -03:00 |
|
|
SandPoot
|
d7942e1365
|
button
|
2023-12-10 00:50:10 -03:00 |
|
|
SandPoot
|
a558377206
|
more stuff i can't guarantee works by itself yet
|
2023-11-29 23:37:15 -03:00 |
|
|
SandPoot
|
40f1d7401d
|
procs
|
2023-11-29 22:40:13 -03:00 |
|
|
SandPoot
|
fd124b03e4
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-11-03 21:27:30 -03:00 |
|
|
SandPoot
|
55e0e5de06
|
real quick
|
2023-10-28 17:54:31 -03:00 |
|
|
SandPoot
|
0b6d743e22
|
go
|
2023-10-28 17:51:02 -03:00 |
|
|
SandPoot
|
6df09381bd
|
Update overlays.dm
|
2023-10-13 16:40:43 -03:00 |
|
|
SandPoot
|
ee163aae68
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-10-12 02:40:12 -03:00 |
|
|
SandPoot
|
41671a5f22
|
quick dmapi stuff update
|
2023-10-10 18:30:48 -03:00 |
|
|
SandPoot
|
f53a7a1f40
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-09-03 17:47:27 -03:00 |
|
|
Katherine Kiefer
|
117690b5a3
|
use the config
|
2023-08-18 22:38:21 +10:00 |
|
|
Katherine Kiefer
|
0870fa9734
|
disable eq
|
2023-08-18 22:36:39 +10:00 |
|
|
Katherine Kiefer
|
16a490ee5c
|
update auxmos
|
2023-08-18 22:13:30 +10:00 |
|
|
SandPoot
|
9a902b6348
|
branch name goes hard
|
2023-08-04 12:29:29 -03:00 |
|
|
SandPoot
|
9d214e2f9d
|
Merge branch 'master' of https://github.com/Sandstorm-Station/Sandstorm-Station-13; branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-04-03 12:53:37 -03:00 |
|
|
LinandGitHub
|
654e5dad9d
|
Merge pull request #15864 from Putnam3145/auxmos-2
UPDATE AUXMOS TO 2.0.0 (TESTMERGE THIS HOLY CRAP)
|
2023-04-01 00:17:22 -07:00 |
|