Commit Graph

605 Commits

Author SHA1 Message Date
deathride58
dd8c641520 Merge pull request #15486 from SandPoot/kills-cache
Solves issues with overlays by updating the whole subsystem
2024-04-12 23:31:54 -04:00
SandPoot
91045350e5 overlay stuff 2024-04-12 22:01:03 -03:00
SandPoot
ca8ce67cd6 mail 2024-04-10 20:54:04 -03:00
SandPoot
0b6d743e22 go 2023-10-28 17:51:02 -03:00
SandPoot
d4ea14c4ef push 2023-10-09 16:15:49 -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
silicons
6efd3098d4 Merge pull request #15961 from zeroisthebiggay/sevakillmarktwo
Removes the SEVA suit, replacing it with the HEVA suit - an ash-storm proof alternative.
2023-03-04 23:36:36 -08:00
SandPoot
2bf781580e Merge branch 'master' into new-decal-painter 2023-02-15 20:06:29 -03:00
Timothy Teakettle
71de9c13e3 Merge pull request #15962 from SandPoot/contextual-screentips
Contextual screentips -- Screentips now show you what items/objects can do
2023-02-15 23:04:54 +00:00
SandPoot
5052f836e7 the stuff 2023-02-06 19:54:54 -03:00
SandPoot
ed06e686e1 pushies. 2023-01-31 16:40:17 -03:00
zerothebigboy
091d9ec00f good 2023-01-30 00:01:22 -05:00
SandPoot
44913d5fff Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into new-decal-painter 2023-01-28 01:20:26 -03:00
SandPoot
c60f36a42b files 2023-01-28 01:10:49 -03:00
silicons
2d5e163916 Merge pull request #15947 from SandPoot/bitfield-updates
Updates bitfields, admin side
2023-01-23 13:02:28 -08:00
SandPoot
854a1c1b5c modified content 2023-01-22 14:09:10 -03:00
Darius
d90fa375e1 Move heirloom lists to relevant files
Port of the current TG heirloom system.

Heirlooms are now stored in job_types and species_types instead of a global list. Items used as heirlooms match their modern TG counterparts when possible.

Also fixes the ancient first aid kit, which is used for a heirloom.
2023-01-04 13:57:54 -05:00
Jerry Wester
13f8559190 add springlock module 2022-12-17 16:54:41 -07:00
Jerry Wester
32a5d02434 Merge branch 'master' into modsuits 2022-12-13 19:18:24 -07:00
PeriodicChaos
183b554ed3 modsuits part 1 2022-12-11 20:30:41 -07:00
Cognition
b747ab56f4 Pins, New Loadout Category, CTRLclick for accessory above suit 2022-11-17 20:58:31 -07:00
shellspeed1
4bade2b1c6 merge conflict fix 2022-09-18 23:10:00 -07:00
shellspeed1
4ddd0e76cc Update flavor_misc.dm 2022-09-17 19:57:26 -07:00
shellspeed1
cf45a23bb4 adds bellows, mumbles, and crackles as speech verbs 2022-09-17 00:59:27 -07:00
Putnam3145
b2d816b825 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into station_traits 2022-08-07 17:59:28 -07:00
SandPoot
b1f10e164e bitfields 2022-07-31 04:49:25 -03:00
deathride58
f30c9406cc randomization! 2022-06-09 15:29:48 -04:00
deathride58
2a720ce054 vocal barks - Fully customizable noises for talking! 2022-06-09 03:59:17 -04:00
deathride58
113981b5a8 Jukebox refresh - Jukebox queue, preliminary multiz support, working volume knob, and more! 2022-05-21 00:21:58 -04:00
Putnam3145
33889870c9 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into station_traits 2022-05-17 13:22:40 -07:00
deathride58
8838fcc2f3 Moves server_taglines.txt to config dir to avoid requiring manual updates of the strings folder with TGS 2022-05-12 17:22:52 -04:00
deathride58
40730237f2 Hub refresh - Cleans up update_status(), adds more hub-related config options, and more! 2022-05-05 14:52:53 -04:00
Timothy Teakettle
e689d16589 i swear im testing it right now and this is not a web edit 2022-04-27 15:26:17 +01:00
Timothy Teakettle
ac4a41243a add salt quirk 2022-04-27 14:58:54 +01:00
Lin
fd286c325e Merge branch 'master' into Projectile_Rework 2022-04-09 04:19:56 +00:00
Putnam3145
6199aa4d60 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into station_traits 2022-03-30 12:35:12 -07:00
Solaris-Shade
d9ff37d2ff Merge branch 'Citadel-Station-13:master' into Projectile_Rework 2022-03-19 11:23:16 -04:00
SandPoot
96e38e965b Merge branch 'master' into mechs-are-vehicles 2022-03-17 22:23:48 -03:00
SandPoot
4da5a57688 global 2022-03-16 18:33:32 -03:00
SandPoot
11522b7761 global var 2022-03-16 18:21:37 -03:00
Solaris-Shade
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
45a49c6106 Upload files 2022-03-05 13:49:26 -03:00
Timothy Teakettle
56547a2556 generalizes recipe searching, adds chemistry functionality 2022-02-23 11:38:04 +00:00
Timothy Teakettle
fd997e1615 initial test changes 2022-02-22 21:59:28 +00:00
keronshb
f1ca283318 Merge branch 'master' into familyport 2022-02-11 14:04:57 -05:00
SandPoot
7e970fe5f1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into changelogs-tgui 2022-02-04 13:06:20 -03:00
SandPoot
29be8573ea Upload files 2022-02-02 02:01:04 -03:00
DeltaFire
e71e86cf23 adapted 2022-01-29 16:43:03 +01:00
silicons
9205545d16 Merge pull request #15317 from LetterN/what-should-i-name-this-branch
TGUI hardsync & stuff
2022-01-25 00:06:59 -08:00