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
SandPoot
fd124b03e4
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-11-03 21:27:30 -03:00
SandPoot
0b6d743e22
go
2023-10-28 17:51:02 -03:00
SandPoot
ee163aae68
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-10-12 02:40:12 -03:00
SandPoot
d4ea14c4ef
push
2023-10-09 16:15:49 -03: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
SandPoot
072087ec14
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-02-15 20:22:44 -03:00
SandPoot and GitHub
2bf781580e
Merge branch 'master' into new-decal-painter
2023-02-15 20:06:29 -03:00
SandPoot
65c38e9828
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-02-10 02:18:08 -03:00
SandPoot
5052f836e7
the stuff
2023-02-06 19:54:54 -03: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
SandPoot
e76ed6a1ea
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-01-17 22:26:56 -03: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
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 and GitHub
32a5d02434
Merge branch 'master' into modsuits
2022-12-13 19:18:24 -07:00
SandPoot
f4b7513f10
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-12-13 01:35:33 -03:00
PeriodicChaos and Jerry Wester
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
SandPoot
4132858e60
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-09-22 02:02:31 -03:00
shellspeed1
4bade2b1c6
merge conflict fix
2022-09-18 23:10:00 -07:00
shellspeed1 and GitHub
4ddd0e76cc
Update flavor_misc.dm
2022-09-17 19:57:26 -07:00
SandPoot
cc9c36bd13
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-09-17 22:48:51 -03:00
shellspeed1 and GitHub
b8f7bb00c9
Fixes encoded langauge so people can speak it, also redoes xeno tongue so it can speak same langauges as rest of crew. ( #15845 )
2022-09-17 13:44:29 -07:00
shellspeed1
cf45a23bb4
adds bellows, mumbles, and crackles as speech verbs
2022-09-17 00:59:27 -07:00
SandPoot
00dadda3df
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-08-07 23:15:57 -03: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
07a4c5c12b
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-06-11 04:54:12 -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
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
SandPoot
24b740999b
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-05-13 02:48:21 -03: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
SandPoot
5c5bb3c5c0
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-05-12 18:09:56 -03: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
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
SandPoot
fb7a24b333
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-02-27 14:17:53 -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
SandPoot
5dc331c406
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-02-13 11:51:07 -03:00
keronshb
f1ca283318
Merge branch 'master' into familyport
2022-02-11 14:04:57 -05:00
SandPoot
e8c8d2b0ef
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-01-25 11:38:07 -03:00
Putnam3145
629ce5bea6
Station traits
2021-12-08 16:17:35 -08:00
LetterN
99019166e4
i think it works
...
MAJOR antag backend update
- you cannot bruteforce the pen anymore
- uplink now uses bitflag to lock purchases
- poplock is handled entirely by the buyable uplink items
- tgui antag intro (for selected ones)
2021-10-30 11:45:50 +08:00
keronshb
41013ec815
Part 2 - Missing stuff from original families port
2021-10-12 12:07:02 -04:00
SandPoot