882 Commits
Author SHA1 Message Date
SandPoot e531826f7d some fixes 2025-06-08 14:07:44 -03:00
SandPoot 2d87780147 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2025-02-13 18:06:56 -03:00
SandPoot 56d972eb0b all sorts of fixes and updates, may break stuff 2025-02-09 02:09:28 -03:00
SandPoot 049f964f94 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2024-10-24 01:37:36 -03:00
SandPoot 2099a76fc7 push 2024-10-20 22:33:23 -03:00
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 95a30412ad Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2024-05-25 15:46:29 -03:00
SandPoot 7f953a03af listener update 2024-05-22 00:06:08 -03:00
SandPoot 91a9223df6 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2024-04-25 17:08:42 -03:00
deathride58 0517ece12a fixes floor decals and other missing signal-added overlays by making sure things properly call parent update_icon 2024-04-24 22:30:25 -04:00
SandPoot 80666ec1dd Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2024-03-30 16:47:39 -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
Katherine Kiefer fd29f9c902 initial 2024-03-09 21:16:02 +11: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 be37603291 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-12-23 13:28:41 -03:00
SandPoot 7b62dbe7bb ai + mech 2023-12-17 23:15:59 -03:00
SandPoot 40f1d7401d procs 2023-11-29 22:40:13 -03:00
SandPoot f53a7a1f40 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-09-03 17:47:27 -03:00
Katherine Kiefer 16a490ee5c update auxmos 2023-08-18 22:13:30 +10:00
SandPoot ef186347ca Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-07-23 18:56:20 -03:00
SandPoot 19ee7f8bd2 some hints 2023-07-19 20:51:25 -03:00
SandPoot 9d214e2f9d Merge branch 'master' of https://github.com/Sandstorm-Station/Sandstorm-Station-13; branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-04-03 12:53:37 -03:00
LinandGitHub 654e5dad9d Merge pull request #15864 from Putnam3145/auxmos-2
UPDATE AUXMOS TO 2.0.0 (TESTMERGE THIS HOLY CRAP)
2023-04-01 00:17:22 -07:00
SandPootandGitHub d362dacfd0 Rebalances the equalizing atmos to be more like bee's (#287) 2023-01-18 08:13:27 -03: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
SandPoot 8911fe5e0b clear em 2022-12-11 17:58:45 -03:00
Putnam3145 b820b61a48 Make QCD not generate infinite science 2022-11-28 23:54:50 -08:00
SandPoot 1607d9ead8 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-10-19 00:54:33 -03:00
Putnam3145 4e2406fdd4 i've just been retestmerging wrong wow. 2022-10-10 23:06:55 -07:00
Putnam3145 892d07975a just?? comment out?? this for now?? 2022-10-10 20:10:21 -07:00
Putnam3145 3b74564a4a well that's no good 2022-10-09 20:27:25 -07:00
Putnam3145 67f2dad1d7 stop stealing the furniture from my house 2022-09-28 12:41:56 -07:00
Putnam3145 17929ced89 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxmos-2 2022-09-28 12:35:58 -07:00
SandPoot a2baf4e789 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-09-28 15:14:24 -03:00
siliconsandGitHub 93e8a69c4c Revert "Updates auxmos to 2.0.0" 2022-09-28 01:05:10 -07:00
Putnam3145 60eb536dd2 A couple things (oy) 2022-09-27 21:46:44 -07:00
SandPoot f039efca97 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2022-09-27 01:19:55 -03:00
Putnam3145 1ac44f22c8 i am wont to make the worst mistakes 2022-09-21 17:55:34 -07:00
Putnam3145 223307aaa8 i need to reimplement this joy 2022-09-21 17:43:37 -07:00
Putnam3145 eb6a86f37f Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxmos-2 2022-09-18 16:41:24 -07:00
Putnam3145andGitHub fa9bbfaedf Revert "Update auxmos to 2.0.0" (#15859) 2022-09-18 16:40:45 -07:00
Putnam3145 d95f5729cc wow i forgot some extremely important updates haha 2022-09-18 16:27:48 -07:00
Putnam3145 1bb15d2858 Fixes condensation overwriting other condensation 2022-08-30 00:21:05 -07:00
Putnam3145 c87c72bfb8 this needs arguments lol 2022-08-28 16:11:51 -07:00
Putnam3145 c96228e258 Updated auxmos to 2.0.0 2022-08-28 15:17:04 -07:00