3014 Commits

Author SHA1 Message Date
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
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
Letter N 64f9605b51 map conflict any% 2021-01-02 19:56:04 +08: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 57f7b3948b BSQL is fucking dead 2020-12-31 15:52:48 +08: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
silicons c25c6b01d7 Update atmospherics.dm 2020-12-27 12:41:07 -07:00
silicons 53253bfce1 changes 2020-12-27 10:13:09 -08:00
raspy-on-osu 13b223d56d removes artifact of extra spaces in ventcrawling defines from previous commit 2020-12-27 02:23:20 -05:00
raspy-on-osu 3738f09ca0 removes setup for ventcrawl implant in case of redundancy 2020-12-27 02:20:19 -05:00
Timothy Teakettle c3e9cdd9a5 finale 2020-12-26 23:09:19 +00:00
raspy-on-osu 0e652cb64c init 2020-12-26 06:02:09 -05: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
DeltaFire 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
DeltaFire 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
Letter N a808f805d4 ASYNC EVERYTHING! 2020-12-21 16:24:51 +08:00
Putnam f0b3ad7a22 mostly works!
occasional deadlock at last test; gonna keep checking that out.
2020-12-18 17:49:32 -08:00
Putnam fbafd8391b Tweaks and such. 2020-12-14 15:38:26 -08:00
Letter N cf692e8426 subsystem upgrades 2020-12-14 15:28:59 +08:00
silicons b34f5d56f6 Merge remote-tracking branch 'citadel/master' into respawn_system_2 2020-12-13 22:54:16 -07:00
DeltaFire d3f3862e18 Merge pull request #13696 from silicons/slime_tf
refactors slime shapeshifting, blobform, and limb regrowth to generic mob ability datums for !!no reason at all other than code improvement!!
2020-12-14 05:57:03 +01:00
DeltaFire dab3f6f125 Merge pull request #13699 from silicons/nanite_updates
nanite updates: permanent nanites, hostile lockdown, anti-virus, resistance tweaking
2020-12-14 05:56:48 +01:00
DeltaFire aff0098b97 Merge pull request #13753 from Citadel-Station-13/silicons-patch-16
[testmerge this first]shoving yourself up now costs 50% more
2020-12-14 05:56:35 +01:00
DeltaFire 1aa032df32 Merge pull request #13752 from Citadel-Station-13/silicons-patch-15
tweaks stamcrit to be removed when under 100 stamina damage, rather than at 140
2020-12-14 05:32:28 +01:00
silicons 5c830d4d44 Merge remote-tracking branch 'citadel/master' into respawn_system_2 2020-12-13 02:34:57 -07:00
Putnam3145 f0e51d666c Merge pull request #13617 from timothyteakettle/loadout-json
loadout 2: electric boogaloo
2020-12-11 18:11:56 -08:00
silicons 45a7c68da1 wow 2020-12-11 15:05:00 -07:00