cyberpresidentvanellope/Sandstorm-Station-13
1
0
Fork 0
mirror of https://github.com/Sandstorm-Station/Sandstorm-Station-13.git synced 2026-08-25 22:29:30 +01:00
Code Issues Packages Projects Releases Wiki Activity
50,585 Commits 8 Branches 0 Tags
master
Commit Graph
57 Commits
Author SHA1 Message Date
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 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 d585e57f55 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2024-03-30 18:57:19 -03:00
SandPoot ffe55f67b1 go!! 2024-03-30 18:29:11 -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
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 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 7b62dbe7bb ai + mech 2023-12-17 23:15:59 -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 7038059ab5 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-05-06 10:47:06 -03:00
KrissKr0ss 66aa1cb05c Revert "Merge pull request #15929 from JerryWester/revert-15894-modsuits" 
This reverts commit 48e713ff33, reversing
changes made to efb2d19cb9.
 2023-05-01 00:16:20 -05:00
SandPoot e42166dda7 branch name 2023-03-14 16:34:54 -03:00
SandPoot 8d6e9f5a2d branch name 2023-03-14 16:25:22 -03:00
SandPoot d743096f8a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-01-09 17:50:19 -03:00
Jerry WesterandGitHub ae347f3399 Revert "MODsuits" 2023-01-08 17:30:26 -07:00
SandPoot 82eff346c7 Merge Upstream 2023-01-07 22:52:22 -03:00
Jerry WesterandGitHub 32a5d02434 Merge branch 'master' into modsuits 2022-12-13 19:18:24 -07:00
SandPoot f4b7513f10 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-12-13 01:35:33 -03:00
LinandGitHub 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
Jerry Wester f7ac3c7624 beeg commit 2022-12-11 20:32:35 -07:00
SandPoot 8911fe5e0b clear em 2022-12-11 17:58:45 -03:00
SandPoot 5384cb9d4b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-10-12 22:25:25 -03:00
Dan-Neposh a447d337a8 misc balance changes 2022-10-06 00:22:51 -04:00
SandPoot 07a4c5c12b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-06-11 04:54:12 -03:00
keronshb aa0d6d37a2 Fixes families 2022-06-09 20:55:40 -04:00
SandPoot d1c44afdae Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-06-01 19:21:46 -03:00
LinandGitHub 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
SandPoot 2189328672 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-06-01 00:11:19 -03:00
DeltaFire 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
deathride58 f751e10cc4 actually wait tracking beacons arent equipment 2022-05-22 19:50:45 -04:00
deathride58 48b34c2332 fixes the ability to attach multiple tracking beacons to a single mech 2022-05-22 19:42:55 -04:00
SandPoot 05349c27e9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-04-15 23:43:43 -03:00
siliconsandGitHub da09439093 Merge pull request #15585 from SandPoot/Initialize(mapload) 
Every case of initialize that should have mapload, does
 2022-04-15 17:41:57 -07:00
SandPoot 260bc007bf Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-04-09 19:51:25 -03:00
SandPootandGitHub 52c144090e Upload fixes (#15591) 2022-04-10 00:44:27 +02:00
SandPoot 2555843026 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Initialize(mapload) 2022-04-09 03:06:56 -03:00
SandPoot 9ad734034a Update mecha_construction_paths.dm 2022-04-09 02:42:01 -03:00
SandPoot ada0ea7f32 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-04-09 02:40:23 -03:00
SandPoot d6624eb705 mech updat 2022-04-09 00:03:33 -03:00
SandPoot 695835fcd6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Initialize(mapload) 2022-04-09 00:03:13 -03:00