a1905591f7
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2024-08-24 23:49:10 -03:00
c07e94be66
push
2024-08-24 21:28:55 -03:00
effdfe954b
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2024-07-05 00:05:20 -03:00
e5a9280ad3
push
2024-07-04 23:44:35 -03:00
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
68fa21d602
content
2024-04-05 17:57:54 -03:00
d585e57f55
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2024-03-30 18:57:19 -03:00
ffe55f67b1
go!!
2024-03-30 18:29:11 -03:00
80666ec1dd
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2024-03-30 16:47:39 -03:00
b76127c2d7
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2024-03-15 19:21:39 -03:00
676cb864b1
missed proc refs
2024-03-12 22:17:30 -03:00
a41d6b4369
fix the runtimes
2024-03-10 12:41:16 +11:00
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
0b990039e3
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2024-01-16 18:00:55 -03:00
c7a2565255
stop this nonsense
2024-01-05 00:28:56 -03:00
7eaef36e11
d k daunkey kaung
2024-01-03 22:42:03 -03:00
4e9ff44ee7
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-12-29 15:49:14 -03:00
ce1d757159
Merge pull request #16016 from SandPoot/throwing-update
...
[TESTMERGE] Updates firemanning, throwing stuff
2023-12-28 22:44:59 -05:00
be37603291
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-12-23 13:28:41 -03:00
b9a422ee2d
throw at mobs laying down
2023-12-18 14:07:25 -03:00
7b62dbe7bb
ai + mech
2023-12-17 23:15:59 -03:00
a558377206
more stuff i can't guarantee works by itself yet
2023-11-29 23:37:15 -03:00
40f1d7401d
procs
2023-11-29 22:40:13 -03:00
0b04af4b76
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-09-14 22:32:47 -03:00
3c7e79d384
do after update
2023-09-09 15:39:49 -03:00
7038059ab5
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-05-06 10:47:06 -03:00
66aa1cb05c
Revert "Merge pull request #15929 from JerryWester/revert-15894-modsuits"
...
This reverts commit 48e713ff33efb2d19cb9
2023-05-01 00:16:20 -05:00
e42166dda7
branch name
2023-03-14 16:34:54 -03:00
8d6e9f5a2d
branch name
2023-03-14 16:25:22 -03:00
d743096f8a
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-01-09 17:50:19 -03:00
ae347f3399
Revert "MODsuits"
2023-01-08 17:30:26 -07:00
82eff346c7
Merge Upstream
2023-01-07 22:52:22 -03:00
35497b250f
Merge pull request #15914 from Hatterhat/conveyor-sorter
...
[good to go] conveyor sorters, conveyor switch tool interacts, also makes mechs not explode on sale
2023-01-07 14:09:55 -08:00
6ce2005f9f
fixes mechs exploding on sale too btw
2022-12-29 20:59:54 -06:00
32a5d02434
Merge branch 'master' into modsuits
2022-12-13 19:18:24 -07:00
f4b7513f10
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-12-13 01:35:33 -03:00
7205781c47
Merge pull request #15892 from SandPoot/let's-sing-the-reference-clearing-song
...
Solves some harddels
2022-12-12 19:11:49 -07:00
f7ac3c7624
beeg commit
2022-12-11 20:32:35 -07:00
8911fe5e0b
clear em
2022-12-11 17:58:45 -03:00
5384cb9d4b
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-10-12 22:25:25 -03:00
a447d337a8
misc balance changes
2022-10-06 00:22:51 -04:00
07a4c5c12b
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-06-11 04:54:12 -03:00
aa0d6d37a2
Fixes families
2022-06-09 20:55:40 -04:00
d1c44afdae
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-06-01 19:21:46 -03:00
4ecf5812ff
Merge pull request #15638 from deathride58/mechatrackless
...
fixes the ability to attach multiple tracking beacons to a single mech
2022-06-01 21:22:16 +00:00
2189328672
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-06-01 00:11:19 -03:00
9c2da5bcf4
power pass
...
mechs actually use power when moving
mining z check isn't falsely inverted
actuator overload cost returned to pre accidental buff levels
correct value for step energy cost now on mechs
parts are now less wacky nor broken for energy cost
2022-05-23 02:16:45 +02:00
f751e10cc4
actually wait tracking beacons arent equipment
2022-05-22 19:50:45 -04:00
48b34c2332
fixes the ability to attach multiple tracking beacons to a single mech
2022-05-22 19:42:55 -04:00
05349c27e9
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-04-15 23:43:43 -03:00
SandPoot