BongaTheProto
d9d617bf8d
Merge branch 'Sandstorm-Station:master' into master
2023-02-10 16:53:13 -05:00
SandPoot
65c38e9828
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2023-02-10 02:18:08 -03:00
Comicao1
fe01f1c5da
Veymed limbs (bounty)
2023-02-07 23:46:49 -03:00
SandPoot
5052f836e7
the stuff
2023-02-06 19:54:54 -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
BongaTheProto
7d5fbe0412
the glooby update
...
very slimy!
2023-01-10 03:36:39 -05: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
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
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
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
SpookyTheFox
08399c3d11
Update poll_ignore.dm
2022-10-01 12:33:36 -07:00
BongaTheProto
65678b2ab5
Merge remote-tracking branch 'upstream/master'
2022-09-22 01:20:52 -05: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
BongaTheProto
9cdaffc417
Merge remote-tracking branch 'upstream/master'
2022-09-18 23:40:20 -05:00
shellspeed1
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
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
BongaTheProto
9e7c5033cc
Merge remote-tracking branch 'upstream/master'
2022-08-07 21:42:16 -05: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
BongaTheProto
825f69c64c
wrists, right?
...
also new manifest
2022-07-26 18:08:24 -05:00
BongaTheProto
03f4c65fc4
Merge remote-tracking branch 'upstream/master'
2022-06-11 23:25:29 -05: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
BongaTheProto
0a97a66551
Merge remote-tracking branch 'upstream/master'
2022-05-13 01:20:04 -05:00
SandPoot
24b740999b
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13
2022-05-13 02:48:21 -03:00
BongaTheProto
f4b9585c12
Merge remote-tracking branch 'upstream/master'
2022-05-12 20:47:56 -05: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
BongaTheProto
5bc3ea02ce
Modularizes and fixes
...
Body sprite option was removed and so were a couple extra pixels in the sprites
2022-05-11 02:45:50 -05:00
catrock31
e4b695ee4d
spectre bot
...
add's a new race
2022-05-05 17:44:19 -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
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
BongaTheProto
54aec9bd98
Merge remote-tracking branch 'upstream/master'
2022-02-27 14:38:06 -05: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
BongaTheProto
c8060ac1a2
Merge pull request #193 from Crowbar764/slaver-patch-4
...
Slaver Patch 4
2022-02-18 01:41:10 -05:00
James
6e7f5c723d
Adds Slaver borgs
2022-02-15 03:27:43 +00:00
