cyberpresidentvanellope/S.P.L.U.R.T-Station-13
1
0
Fork 0
mirror of https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git synced 2026-08-21 03:36:47 +01:00
Code Issues Packages Projects Releases Wiki Activity
55,761 Commits 55 Branches 0 Tags
interactions-issues
Commit Graph
210 Commits
Author SHA1 Message Date
BongaTheProto 085bb06e94 Merge remote-tracking branch 'upstream/master' 2023-09-16 14:32:38 -05:00
SandPoot 0b04af4b76 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-09-14 22:32:47 -03:00
SandPoot 3c7e79d384 do after update 2023-09-09 15:39:49 -03:00
Tsurupeta d4ec25e748 all else 2023-08-08 14:01:18 +03:00
BongaTheProto 5116acad15 Merge remote-tracking branch 'upstream/master' 2023-05-06 18:31:55 -05: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
BongaTheProtoandGitHub a3d68a2f95 Merge pull request #786 from KeplerWasTaken/mechdrillfix 
Mech Drill Fix & Lavaland Syndicate Base Fix
 2023-03-23 02:45:07 -05:00
BongaTheProto 017c235b4f Merge remote-tracking branch 'upstream/master' 2023-03-14 17:43:38 -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
KeplerWasTaken 6516901a9c Mech Drill now no longer works if the target is further away than 1 tile, and the diamond drill applies the correct damage 2023-03-12 10:37:25 +01:00
BongaTheProto ab9d691f1a Merge remote-tracking branch 'upstream/master' 2023-01-09 16:59:38 -05: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
siliconsandGitHub 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
Hatterhat 6ce2005f9f fixes mechs exploding on sale too btw 2022-12-29 20:59:54 -06:00
Jerry WesterandGitHub 32a5d02434 Merge branch 'master' into modsuits 2022-12-13 19:18:24 -07:00
BongaTheProto ee6823c69b Merge remote-tracking branch 'upstream/master' 2022-12-13 12:14:11 -05: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
BongaTheProto 79fa770ab3 Merge remote-tracking branch 'upstream/master' 2022-10-13 11:21:32 -05: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
BongaTheProto 509b8df511 Modularize everything 
this seems to be working I thibk
 2022-08-06 17:35:53 -05:00
Le Commandor d9c9637adc yes 2022-07-30 20:45:20 +04:00
Le Commandor 935c85e050 Update savannah_ivanov.dm 2022-07-30 14:01:16 +04:00
Le Commandor 44645eff18 help 2022-07-30 13:51:22 +04:00
Le Commandor f59c942f71 Savannah V1.8 
Everything's done basically, some runtimes while shooting missiles (object podspawn forcemove) and idk how to stretch overlay to fit the screen so i'll comment it until someone else fixes this or i will learn how to code
 2022-07-29 20:53:43 +04:00
Le Commandor 1b25f754e4 V1.6 
Fixes some things. Adds unique icons for savannah_ivanov + toy version
 2022-07-29 13:02:11 +04:00
Le Commandor 60f540da7a Fix (V1.1) 2022-07-28 10:21:19 +04:00
Le Commandor 2421acc4cf Mech V1 2022-07-27 23:33:47 +04:00
Le Commandor 8e13f750ff Coopmech V0.5 
Added:
Landing zone sprite specially for S-V
Fix:
Parts not defined
 2022-07-27 15:18:27 +04:00
Le Commandor bed03bec5e Coop mech V0.3 
Fixes bad argument
 2022-07-27 14:59:15 +04:00
Le Commandor 06f7e19cbb Coop mech V0.2 2022-07-27 14:53:18 +04:00
Le Commandor ab7bafa7d8 Coop-mech (Savannah Ivanov) V0.1 
It's my first day
 2022-07-27 14:46:28 +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
SandPootandGitHub 13fb647b9e Update files (#15597) 2022-04-15 16:31:50 +02:00