BongaTheProto and GitHub
6fe72aba1d
Merge pull request #1138 from Fabian272/patch-3
...
Makes bounty consoles printable
2024-05-09 00:07:00 -05:00
Elizabeth Lavenza
7890d2b174
Fix nonexistent keyboard overlays
2024-04-13 20:03:56 -04:00
Elizabeth Lavenza
0772450dbc
Port set_stat and COMSIG_MOB_STATCHANGE from TG
2024-04-13 20:00:29 -04:00
Fabian S and GitHub
35727eb46f
Adds bounty consoles to research
...
Apparently they have a design that isn't researchable! And no, I'm not talking about the civvie ones.
2024-04-13 22:42:20 +02:00
BongaTheProto
1e1fc329f8
Merge remote-tracking branch 'upstream/master' into upstream-merge
2024-04-13 14:12:39 -05:00
SandPoot
002a4c31c1
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2024-04-12 22:06:15 -03:00
SandPoot
ca8ce67cd6
mail
2024-04-10 20:54:04 -03:00
BongaTheProto
493fa7f215
Merge branch 'master' into upstream-merge
2024-03-28 15:43:55 -05:00
BongaTheProto
81ed818ceb
Modularize
2024-03-28 14:52:20 -05:00
BongaTheProto
b2e14a5393
Merge remote-tracking branch 'upstream/master' into upstream-merge
2024-03-24 17:02:38 -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
MR.Sasma
0ccdbbac84
update
...
Small update
2024-03-07 18:57:22 +00:00
MR.Sasma
54d7e5237c
limbgrower_Fix_+_added_reagents
...
As name says lol (Fixed code so you can now print three more races bodyparts)
2024-03-07 17:00:21 +00:00
BongaTheProto
d1b0e9ec9f
Merge remote-tracking branch 'upstream/master'
2024-03-01 21:15:28 -05: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
ariaworld
fde8d80de6
Merge remote-tracking branch 'upstream/master' into december-qol
2024-01-02 21:16:39 +01:00
SandPoot
ffcb0d9460
forgot to push
2024-01-02 14:59:32 -03:00
BongaTheProto
a9715638ad
Merge remote-tracking branch 'upstream/master'
2024-01-02 01:00:59 -05:00
deathride58 and GitHub
c660811fe8
Merge pull request #16027 from DeltaFire15/modsuit-updates
...
Some modsuit updates
2024-01-01 21:08:56 -05:00
ariaworld
927dbf77f2
Makes the BEPIS less annoying.
2024-01-01 22:42:28 +01:00
ariaworld
43c8840011
Add: advanced screwdriver to bepis
2024-01-01 03:22:35 +01:00
ariaworld
78a09d2736
Nevermind: revert
2024-01-01 01:49:16 +01:00
ariaworld
9d3b07e91b
Fix: alien glands bepis spawner
2023-12-31 22:20:47 +01:00
SandPoot
65ed5c79f4
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-12-30 02:07:21 -03:00
SandPoot
6733de69bd
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into stacks
2023-12-29 23:16:11 -03:00
ariaworld
e7f21743c9
Fix wrong research design icon state
2023-12-29 20:50:20 +01:00
BongaTheProto
13cd269788
Merge remote-tracking branch 'upstream/master'
2023-12-25 14:28:51 -05:00
SandPoot
be37603291
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-12-23 13:28:41 -03:00
ariaworld
e9592e18fc
Merge remote-tracking branch 'upstream/master' into december-qol
2023-12-23 15:00:19 +01:00
ariaworld
22befe7327
Winter QOL
2023-12-23 14:59:11 +01:00
SandPoot
27bdd4b732
aiModule > ai_module
2023-12-17 23:20:43 -03:00
SandPoot
f626df9d1d
push
2023-12-13 00:08:58 -03:00
Fabian272
bb6256de0d
Almost forgot about these
...
Might as well while I'm at it right
2023-12-04 01:42:57 +01:00
Fabian272
a57cbecc1f
biogenerator
...
This kept peeving me because it says "bottle" but it just adds 10u of the reagent. Also the other 2 are in 30u steps for some reason unlike 10 like the rest.
2023-12-03 15:30:47 +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
DeltaFire
a9af463fdf
fixes a broken technode icon
2023-11-13 14:03:46 +01:00
MysteryMan21333
06153ae98f
Xenobiology V1.0
2023-10-14 07:15:46 -05:00
Vhariik
d35affb5de
Shuttle research is now a roundstart tech
2023-08-27 23:55:11 -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
Jerry Wester and KrissKr0ss
4ba7f2ac0a
add paint kit to research
2023-05-01 00:22:37 -05: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
2151624f10
Merge remote-tracking branch 'upstream/master'
2023-02-22 19:14:08 -05:00
SandPoot and SandPoot
2bdec078d7
Merge pull request #311 from Sandstorm-Station/duct-piping
...
Several duct pipe fixes/qol
2023-02-21 16:44:35 -03:00
SandPoot
e0c8419cdd
deal with duct pipes
2023-02-21 16:09:35 -03:00
