Commit Graph
189 Commits
Author SHA1 Message Date
SandPoot 9f3c825790 - missing keyword args 2023-08-26 23:01:51 -03:00
SandPoot 9e8a510ed5 chapter 2: allow right click on action buttons 2023-08-26 21:37:06 -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
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
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
SandPootandGitHub 13fb647b9e Update files (#15597) 2022-04-15 16:31:50 +02: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 9df4ed8253 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-04-09 02:48:16 -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
LinandGitHub fd286c325e Merge branch 'master' into Projectile_Rework 2022-04-09 04:19:56 +00: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
SandPoot 1bb76168c4 fix 2022-04-08 14:12:26 -03:00
SandPoot 586a035132 Update files 2022-04-06 18:41:31 -03:00
SandPoot 05ff3406ea do this 2022-04-06 17:35:11 -03:00
SandPoot d711a0901c Dual seater coming right up. 2022-03-23 13:05:51 -03:00
SandPoot 189716314f Would you like some defines in these trying times? 2022-03-23 12:10:02 -03:00
SandPoot d8f656ecf1 restores EMP behavior 2022-03-23 10:26:58 -03:00
SandPoot aec888a7b6 Update files 2022-03-16 15:17:57 -03:00
SandPoot a8f454bd72 Upload files 2022-03-16 14:00:31 -03:00
Solaris-ShadeandGitHub 0395ba47d7 Merge branch 'master' into Projectile_Rework 2022-03-11 23:07:31 -05:00
Solaris-Shade 2fdb70b2b9 [DNM][DNM][WIP] Projectile backend code port and update
Ports#54924,  #65061, #59804 from /tg.
adds auxiliary code from /tg to make code work.
2022-03-06 15:20:23 -05:00
SandPoot fb7a24b333 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-02-27 14:17:53 -03:00
SandPoot 5029af901b Upload files 2022-02-25 16:58:09 -03:00