 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
|
a0ec4926c1
|
re-enables hud item preview
|
2024-04-13 01:13:10 -03:00 |
|
|
BongaTheProto
|
65c2092959
|
Merge remote-tracking branch 'upstream/master' into upstream-merge
|
2024-04-12 18:40:08 -05:00 |
|
|
SandPoot
|
516ae4a3f0
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2024-04-12 17:21:56 -03:00 |
|
|
SandPoot
|
8a42d1cf5f
|
go
|
2024-04-12 14:23:28 -03:00 |
|
|
BongaTheProto
|
2709ec887c
|
Merge remote-tracking branch 'upstream/master' into upstream-merge
|
2024-04-06 19:06:12 -05:00 |
|
|
BongaTheProto
|
dc057a41ad
|
Merge branch 'master' into upstream-merge
|
2024-04-06 18:51:51 -05:00 |
|
|
SandPoot
|
5a0ad158e8
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2024-04-01 18:43:10 -03:00 |
|
|
SandPoot
|
9fcce9f100
|
byond math is bad math
|
2024-04-01 18:10:40 -03:00 |
|
|
Elizabeth Lavenza
|
ccfc08b7a8
|
Fix attack_hand-related runtimes
|
2024-04-01 11:33:30 -04:00 |
|
|
BongaTheProto
|
d20caf7191
|
Merge branch '515-update' into upstream-merge
|
2024-03-24 17:39:24 -05: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 |
|
|
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
|
d1b0e9ec9f
|
Merge remote-tracking branch 'upstream/master'
|
2024-03-01 21:15:28 -05:00 |
|
|
nickstershovel
|
1a0a313225
|
Fix borgs, fix ssd_mob_list removal
|
2024-02-10 21:42:20 +01: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 |
|
|
SandPoot
|
17a01b6f2a
|
revert stuff
|
2024-01-16 14:53:48 -03:00 |
|
|
BongaTheProtoandGitHub
|
8e8999fa08
|
Merge branch 'Sandstorm-Station:master' into master
|
2024-01-07 19:58:34 -05:00 |
|
|
SandPoot
|
0919b13d63
|
extra stuff
|
2024-01-07 03:47:09 -03: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
|
6d7321b0c4
|
okay so this is necessary
|
2024-01-05 22:09:21 -03:00 |
|
|
SandPoot
|
51c1c2abc9
|
huds!
|
2024-01-05 17:07:54 -03:00 |
|
|
SandPoot
|
c7a2565255
|
stop this nonsense
|
2024-01-05 00:28:56 -03:00 |
|
|
SandPoot
|
05e2cc0979
|
there
|
2024-01-05 00:18:21 -03:00 |
|
|
SandPoot
|
a8be340925
|
fix constructs follow-up pr
|
2024-01-03 22:46:19 -03:00 |
|
|
SandPoot
|
7eaef36e11
|
d k daunkey kaung
|
2024-01-03 22:42:03 -03:00 |
|
|
BongaTheProto
|
a9715638ad
|
Merge remote-tracking branch 'upstream/master'
|
2024-01-02 01:00:59 -05:00 |
|
|
SandPoot
|
65ed5c79f4
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-12-30 02:07:21 -03:00 |
|
|
SandPoot
|
6733de69bd
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into stacks
|
2023-12-29 23:16:11 -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
|
b9a422ee2d
|
throw at mobs laying down
|
2023-12-18 14:07:25 -03:00 |
|
|
BongaTheProto
|
c1c9fef224
|
Merge remote-tracking branch 'upstream/master'
|
2023-12-15 18:12:47 -05:00 |
|
|
SandPoot
|
f626df9d1d
|
push
|
2023-12-13 00:08:58 -03:00 |
|
|
SandPoot
|
8cdb82a23f
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-12-12 22:06:13 -03:00 |
|
|
deathride58andGitHub
|
3e45c18ab4
|
Merge pull request #16038 from SandPoot/fix-lava+borgs
Deals with lava plus a lot of borg stuff
|
2023-12-12 19:25:13 -05:00 |
|
|
deathride58andGitHub
|
e729badcd2
|
Merge pull request #16039 from SandPoot/maptexts-(verb)-maptexts-(variable)
Maptext()s the maptexts
|
2023-12-12 19:21:17 -05:00 |
|
|
SandPoot
|
e457f40328
|
maptext
|
2023-12-11 17:43:24 -03:00 |
|
|
BongaTheProto
|
700fd57efb
|
Merge remote-tracking branch 'upstream/master'
|
2023-12-08 20:22:05 -05:00 |
|
|
SandPoot
|
c1ec13b1bf
|
maybe final
|
2023-12-07 23:55:44 -03:00 |
|
|
SandPoot
|
42fdd30ba4
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
|
2023-12-05 17:47:58 -03:00 |
|
|
SandPoot
|
40f1d7401d
|
procs
|
2023-11-29 22:40:13 -03:00 |
|
|
SandPoot
|
b290efc434
|
push
|
2023-11-22 14:11:17 -03:00 |
|