Commit Graph
2476 Commits
Author SHA1 Message Date
Putnam d1e8891d9e makes what i'm doing with model_temp more explicit 2021-01-20 18:43:59 -08:00
Putnam 165cdbf040 Makes it compile. 2021-01-20 18:36:45 -08:00
Putnam 158dd11d8d Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos 2021-01-19 17:52:40 -08:00
Putnam f05df1c7de Huge optimizations+some fixes 2021-01-19 17:48:20 -08: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
siliconsandGitHub 8d023b26b4 Merge pull request #14030 from Putnam3145/usual-judgment
Replaces majority judgment with usual judgement
2021-01-17 20:41:29 -07:00
Putnam a6a91347ff Fixed machinery not being processed. 2021-01-13 21:28:58 -08:00
silicons 8f7b483161 remove reverb 2021-01-13 21:37:30 -07:00
siliconsandGitHub 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
siliconsandGitHub 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
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
Putnam 6721bac4ea forgot about funny linux 2021-01-07 02:13:36 -08:00
Putnam 186bb483b1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos 2021-01-06 23:55:24 -08:00
Putnam 555c384d73 Added maptick. 2021-01-06 23:55:06 -08:00
silicons 16a9361345 move this 2021-01-05 22:48:28 -08:00
siliconsandGitHub 6269819c46 Update status_effects.dm 2021-01-05 02:45:36 -07:00
siliconsandGitHub c3e4eed5c7 Merge pull request #13938 from timothyteakettle/funny-synths
anthromorphic synth species
2021-01-03 18:10:06 -07:00
siliconsandGitHub 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
DeltaFireandGitHub 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
siliconsandGitHub 50de8d7590 Update atmospherics.dm 2020-12-27 12:43:21 -07:00
siliconsandGitHub c25c6b01d7 Update atmospherics.dm 2020-12-27 12:41:07 -07:00
Timothy Teakettle c3e9cdd9a5 finale 2020-12-26 23:09:19 +00:00
Letter N 47a3afff54 DB stickies 2020-12-23 16:50:48 +08:00
Letter N 792c9ad752 actualy important because of glidesize 2020-12-23 14:16:29 +08:00
Letter N 18168920ad REVERT YOU GIT 2020-12-23 12:34:50 +08:00
Letter N e9ca58446c Merge remote-tracking branch 'origin/master' into semi-sync 2020-12-23 12:25:24 +08:00
DeltaFireandGitHub d3f30d21cf Merge pull request #13772 from silicons/respawn_system_2
adds a respawn/return to lobby system, tweaks cryo to preserve everything instead of just ""important items""
2020-12-22 17:40:33 +01:00
DeltaFireandGitHub 65c14cf289 Merge pull request #13537 from silicons/permissions
support update for event manager permissions
2020-12-22 16:12:03 +01:00
Letter N b72299c487 re-activates extool again
dbcore soon™
2020-12-21 21:29:09 +08:00
Letter N abd94d1c03 Merge remote-tracking branch 'origin/master' into semi-sync 2020-12-21 21:19:06 +08:00
Letter N 2966f985a3 rustg updates& makes shit work 2020-12-21 21:06:45 +08:00
Letter N 98ff0a080e ImmursionAudio(TM) 2020-12-21 19:47:11 +08:00