1416 Commits

Author SHA1 Message Date
SpaceCat404 e2cd9661f2 Added lines to end of files, modularized previous additions, added user input to close batch file 2024-12-05 14:11:31 -06:00
SpaceCat404 53e6c2e251 Added Nyanese language, "Catpain" Captain title, Old Glory sunflower seeds. 2024-12-05 04:11:07 -06:00
Mosley 106d5b3c1e Merge remote-tracking branch 'upstream/master' 2024-08-25 12:48:45 -05: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
Mosley 91a0b89c9f Merge remote-tracking branch 'upstream/master' 2024-08-13 15:07:57 -05:00
SandPoot bc0dc5ee02 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2024-08-12 19:54:43 -03:00
SandPoot 0fd4dba15b push 2024-08-11 14:10:35 -03:00
SandPoot fc53ab850c Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2024-04-14 20:15:08 -03:00
Elizabeth Lavenza 0772450dbc Port set_stat and COMSIG_MOB_STATCHANGE from TG 2024-04-13 20:00:29 -04:00
Elizabeth Lavenza 174aca4b01 Port set_stat and COMSIG_MOB_STATCHANGE from TG 2024-04-13 18:06:52 -04:00
BongaTheProto dc057a41ad Merge branch 'master' into upstream-merge 2024-04-06 18:51:51 -05:00
Elizabeth Lavenza 382cb28b15 Fix a number of reported runtimes 2024-04-01 11:33:31 -04:00
deathride58 f38172182d Merge pull request #16058 from SandPoot/remove-cyborg-safety
Removes cyborg surgery safety that messes with other medical instruments
2024-03-30 17:58:40 -04:00
BongaTheProto b2e14a5393 Merge remote-tracking branch 'upstream/master' into upstream-merge 2024-03-24 17:02:38 -05:00
BongaTheProto 8bbb0fda41 Merge branch 'master' into upstream-merge 2024-03-24 16:41:07 -05: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 fcd036dab5 final stuff, i think? 2024-03-07 20:31:53 -03:00
BongaTheProto d1b0e9ec9f Merge remote-tracking branch 'upstream/master' 2024-03-01 21:15:28 -05:00
ariaworld 0e11e93acf Blow kisses! 2024-02-22 12:35:21 +01:00
SandPoot ee4d35ad32 here 2024-02-05 14:59:20 -03:00
SandPoot 354ef121b0 solve cyborgs cannot scan with health analyzer 2024-02-05 14:14:36 -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
Anonymous 5c21e6fcf4 Merge remote-tracking branch 'upstream/master' into pr-ex/peep-peep 2024-01-12 06:24:32 +03:00
Anonymous c70d5f2eca Language fix
- Fixes avian language being understood but not spoken when selected;
 - Added `modular_splurt` language path for further lang additions;
  - Thus, avian language is now downward of this.
2024-01-10 12:22:06 +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
Fabian S b16a5ce66d Changes the item names instead
Shrimple as
2024-01-02 20:55:50 +01: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
BongaTheProto 27df3d0753 Merge pull request #840 from Comicao1/Races-port
Teshari [TESTING]
2023-09-10 23:59:28 -05:00
Comicao1 cec654a181 Modularizes stuff that needs to me modularized 2023-09-07 22:07:26 +03:00
Comicao1 3cbf9ed3f0 Go on 2023-09-07 04:42:07 +03:00
BongaTheProto 3d421a7f12 Merge branch 'master' into pr/840 2023-08-13 14:43:09 -05:00
Tsurupeta d4ec25e748 all else 2023-08-08 14:01:18 +03:00
BongaTheProto 2ede3a6f60 Merge pull request #913 from JMoldy/vomitfix
Makes vomiting clear some disgust
2023-07-26 19:41:45 -05:00
JMoldy 42b1aa7693 Makes vomiting clear some disgust 2023-07-26 16:49:13 -05:00
BongaTheProto e87e828638 Merge remote-tracking branch 'upstream/master' 2023-07-25 22:47:02 -05: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
Comicao1 68c2381fd6 Hahaw 2023-05-14 13:21:10 -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
BongaTheProto 972df3f711 Merge remote-tracking branch 'upstream/master' 2023-02-16 16:30:59 -05:00
SandPoot 072087ec14 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 2023-02-15 20:22:44 -03:00
SandPoot ed06e686e1 pushies. 2023-01-31 16:40:17 -03:00
BongaTheProto 21c3abdfb7 Merge remote-tracking branch 'upstream/master' 2023-01-18 04:20:45 -05:00