Elizabeth Lavenza
0772450dbc
Port set_stat and COMSIG_MOB_STATCHANGE from TG
2024-04-13 20:00:29 -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
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
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
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 and GitHub
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 and GitHub
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 and GitHub
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 48e713ff33efb2d19cb9
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
SandPoot
e76ed6a1ea
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-01-17 22:26:56 -03:00
Darius and GitHub
791f89a179
Prevent nutriment pump with no process food trait ( #15941 )
...
Prevents the nutriment pump implant from functioning on mobs with TRAIT_NO_PROCESS_FOOD., as this behavior appears to be unintended.
2023-01-14 04:51:42 +01: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 Wester and GitHub
ae347f3399
Revert "MODsuits"
2023-01-08 17:30:26 -07:00
SandPoot
82eff346c7
Merge Upstream
2023-01-07 22:52:22 -03:00
silicons and GitHub
23327fa268
Merge pull request #15894 from JerryWester/modsuits
...
MODsuits
2023-01-07 14:07:28 -08:00
BongaTheProto
a04476b38d
Merge remote-tracking branch 'upstream/master'
2022-12-16 20:39:53 -05:00
SandPoot
011dd2e817
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-12-16 16:47:19 -03:00
Lin and GitHub
7d0c3df2ad
Merge pull request #15755 from timothyteakettle/dullahan-2-electric-boogaloo
...
dullahans 2: electric boogaloo
2022-12-14 19:07:59 -07:00
Jerry Wester and GitHub
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
Lin and GitHub
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
Elizabeth Lavenza