Commit Graph

2486 Commits

Author SHA1 Message Date
Putnam
cbac292731 Adds back aphro, nympho 2021-02-18 21:22:43 -08:00
silicons
3cac44b2f0 a 2021-02-15 19:35:16 -07:00
Lin
1d00bc51cb Merge pull request #14238 from Citadel-Station-13/silicons-patch-13
fixes linter errors with COMPILE_OVERLAYS (wow this is stupid)
2021-02-14 13:34:25 -06:00
Lin
98736a7a37 Merge pull request #14207 from TyrianTyrell/master
Multilingual fix? (Has since been tested.)
2021-02-13 16:41:10 -06:00
silicons
66570144b9 Update subsystems.dm 2021-02-12 23:15:36 -07:00
silicons
110b4981dd Update subsystems.dm 2021-02-12 23:13:33 -07:00
silicons
f6cb489e73 Update subsystems.dm 2021-02-12 23:03:08 -07:00
TyrianTyrell
b7b8be6f39 Update language.dm 2021-02-08 07:27:47 -05:00
silicons
86066450f3 Merge pull request #14179 from TyrianTyrell/master
Signed language (Requested changes complete)
2021-02-06 11:42:24 -07:00
Lin
fe263ae2ff Merge pull request #13890 from silicons/parry
ablative parry armwraps
2021-02-05 23:52:18 -06:00
TyrianTyrell
992b7909ba Update traits.dm 2021-02-01 05:35:49 -05:00
silicons
1d72a574b2 Merge pull request #14093 from timothyteakettle/rename-redescribe-loadout
loadout part 3: custom names and descriptions
2021-01-27 19:09:41 -07:00
silicons
6a2ae34ebe Merge pull request #14111 from Arturlang/revenant_TK
[READY]Gives the revenant TK
2021-01-25 23:17:09 -07:00
silicons
6094293b4b Merge pull request #14105 from DeltaFire15/heretic-target-fix
Heretic sacrifice target logging + a fix
2021-01-25 22:58:54 -07:00
raspy-on-osu
59f59178f4 does this work 2021-01-24 19:24:50 -05:00
raspy-on-osu
622a3df378 Merge branch 'master' of https://github.com/raspy-on-osu/Citadel-Station-13 into ventcrawl-refactor 2021-01-24 19:21:24 -05:00
Artur
66979e2364 Merge branch 'master' into revenant_TK 2021-01-20 18:27:11 +02:00
DeltaFire
4578f30001 brrt 2021-01-20 05:54:38 +01:00
silicons
dedb0cb62e Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-19 04:24:42 -07:00
silicons
f0a9a7a179 fix 2021-01-19 04:21:21 -07:00
Timothy Teakettle
b956df2226 name description implement 2021-01-18 21:59:00 +00:00
silicons
8d023b26b4 Merge pull request #14030 from Putnam3145/usual-judgment
Replaces majority judgment with usual judgement
2021-01-17 20:41:29 -07:00
silicons
8f7b483161 remove reverb 2021-01-13 21:37:30 -07:00
silicons
c66874f732 Merge pull request #14032 from kappa-sama/kaiowhat
two toggled self-buffing spells that have no relation to any anime or video game in particular
2021-01-13 16:50:50 -07:00
silicons
310a631ffa Merge pull request #14025 from DeltaFire15/synth-robotics-revival
More Synth tweaks
2021-01-13 16:48:05 -07:00
silicons
ea07ad6e48 Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-13 15:41:28 -07:00
silicons
343ef7db2c fixes 2021-01-13 14:23:35 -07:00
silicons
3fe2776a6a fix 2021-01-13 13:44:46 -07:00
Artur
2f619ffc4e Traits 2021-01-13 10:27:10 +02:00
kappa-sama
c751f114aa finally 2021-01-12 01:42:55 -05:00
Putnam
02efd6237f Replaces majority judgment with usual judgement 2021-01-11 12:39:18 -08:00
DeltaFire
2b1d79dae0 synth medstuff 2021-01-11 02:11:30 +01:00
silicons
2525334bb0 smooth movement twaeks 2021-01-09 15:30:56 -08:00
silicons
bffc43e95e fixes 2021-01-08 18:59:26 -08:00
silicons
03a0900afe debug time 2021-01-08 03:03:14 -08:00
silicons
2870f5c7f1 uh 2021-01-08 01:46:09 -08:00
silicons
3795753ec0 uh 2021-01-08 01:10:17 -08:00
silicons
ddad368d6a Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-08 00:33:57 -08:00
silicons
16a9361345 move this 2021-01-05 22:48:28 -08:00
silicons
6269819c46 Update status_effects.dm 2021-01-05 02:45:36 -07:00
silicons
c3e4eed5c7 Merge pull request #13938 from timothyteakettle/funny-synths
anthromorphic synth species
2021-01-03 18:10:06 -07:00
silicons
697619856c Merge pull request #13859 from timothyteakettle/unlockable-loadout-items
unlockable loadout items
2021-01-03 18:07:18 -07:00
Timothy Teakettle
813e0f4c79 Merge remote-tracking branch 'upstream/master' into unlockable-loadout-items 2021-01-01 22:30:04 +00:00
DeltaFire
38565e0027 Merge pull request #13909 from silicons/twitch_plays
Twitch Plays: Clown Car
2021-01-01 04:14:26 +01:00
Timothy Teakettle
3cde6799f7 define 2020-12-31 19:02:03 +00:00
Letter N
bf92751800 a 2020-12-29 13:41:26 +08:00
Letter N
51143f89e5 Merge remote-tracking branch 'origin/master' into semi-sync 2020-12-29 10:37:06 +08:00
silicons
6e86cc7758 wew 2020-12-28 17:27:16 -08:00
tgstation-server
14cefb2d35 Update TGS DMAPI 2020-12-29 00:59:40 +00:00
silicons
50de8d7590 Update atmospherics.dm 2020-12-27 12:43:21 -07:00