Commit Graph
39336 Commits
Author SHA1 Message Date
siliconsandGitHub 1c915c2e6f Merge pull request #13676 from DeltaFire15/borg-slab-fix
Very minor fix to clockie borg slab ui
2020-11-17 01:12:28 -07:00
CitadelStationBot d6866c5bc2 Automatic changelog generation for PR #13675 [ci skip] 2020-11-17 02:11:04 -06:00
siliconsandGitHub 6a7ab4de67 Merge pull request #13675 from DeltaFire15/sleeper-ui-fix
Fixes sleeper UI Interactiveness
2020-11-17 01:11:01 -07:00
CitadelStationBot 41575d2264 Automatic changelog generation for PR #13674 [ci skip] 2020-11-17 02:10:57 -06:00
siliconsandGitHub f11b636727 Merge pull request #13674 from DeltaFire15/vtec-fixing
The borg VTEC ability no longer persists after the upgrade is removed
2020-11-17 01:10:53 -07:00
CitadelStationBot 874687ea2d Automatic changelog generation for PR #13673 [ci skip] 2020-11-17 02:10:48 -06:00
siliconsandGitHub b9b67f62a3 Merge pull request #13673 from Arturlang/sacrifice_tweaks
Makes construct mind saving reference the mind, fixing some issues
2020-11-17 01:10:45 -07:00
CitadelStationBot ecc99f6daa Automatic changelog generation for PR #13671 [ci skip] 2020-11-17 02:10:30 -06:00
siliconsandGitHub 1942e16a82 Merge pull request #13671 from DeltaFire15/clock-rite-neutering-support
Just some more clock rite code-wise support
2020-11-17 01:10:26 -07:00
siliconsandGitHub 157b2b6e2a Merge pull request #13665 from Citadel-Station-13/tgs-dmapi-update
Automatic TGS DMAPI Update
2020-11-17 01:10:03 -07:00
CitadelStationBot e2fe97e86a Automatic changelog generation for PR #13644 [ci skip] 2020-11-17 02:09:51 -06:00
siliconsandGitHub a950bcb0fb Merge pull request #13644 from DeltaFire15/hybrid-limbs-wound-stuff
[READY] Hybrid bodyparts - wound surgery edition
2020-11-17 01:09:47 -07:00
tgstation-server 03b2f1ac2e Update TGS DMAPI 2020-11-17 00:37:11 +00:00
DeltaFire fb128e64b1 Merge remote-tracking branch 'upstream/master' into borg-slab-fix 2020-11-16 04:31:31 +01:00
DeltaFire c8719e18d8 Merge remote-tracking branch 'upstream/master' into sleeper-ui-fix 2020-11-16 04:31:02 +01:00
DeltaFire 44a49a7261 Merge remote-tracking branch 'upstream/master' into vtec-fixing 2020-11-16 04:30:45 +01:00
DeltaFire fbad172861 Merge remote-tracking branch 'upstream/master' into clock-rite-neutering-support 2020-11-16 04:30:15 +01:00
CitadelStationBot bf69245a58 Automatic changelog generation for PR #13670 [ci skip] 2020-11-15 18:12:40 -06:00
siliconsandGitHub 9d7226cb4d Merge pull request #13670 from shellspeed1/master
Makes floor bots buildable with all toolboxes.
2020-11-15 17:12:37 -07:00
CitadelStationBot d2f978d9f3 Automatic changelog generation for PR #13678 [ci skip] 2020-11-15 18:11:55 -06:00
siliconsandGitHub 2a076da3b5 Merge pull request #13678 from Arturlang/Should_not_sleep_not
Comments out spacemandmm should not sleeps
2020-11-15 17:11:52 -07:00
CitadelStationBot e22e02e5ff Automatic changelog generation for PR #13683 [ci skip] 2020-11-15 18:11:23 -06:00
siliconsandGitHub 15bb6c96ec Merge pull request #13683 from SandPoot/master
Attempts to turn gift static blacklist into a global list
2020-11-15 17:11:21 -07:00
SandPootandGitHub 00adf078b0 this is needed 2020-11-15 19:13:01 -03:00
SandPootandGitHub cbb44674ac fix + renaming global list? 2020-11-15 19:10:50 -03:00
CitadelStationBot 8d51f402d8 Automatic changelog generation for PR #13682 [ci skip] 2020-11-15 16:09:25 -06:00
siliconsandGitHub fde0bd8c66 Merge pull request #13682 from EmeraldSundisk/cogarea
Trying to figure out what's up with CogStation...
2020-11-15 15:09:22 -07:00
EmeraldSundiskandGitHub 330da48518 Add files via upload 2020-11-14 15:38:33 -08:00
SandPoot 936bda44db upload gift.dm 2020-11-14 20:38:23 -03:00
EmeraldSundiskandGitHub 00398cb45a Add files via upload 2020-11-14 15:14:53 -08:00
EmeraldSundiskandGitHub 76b7b68730 Add files via upload 2020-11-14 13:40:39 -08:00
EmeraldSundiskandGitHub 993ac9b52d Add files via upload 2020-11-14 13:32:34 -08:00
EmeraldSundisk 81c9bfecdc Update CogStation.dmm 2020-11-14 10:37:05 -08:00
EmeraldSundiskandGitHub 338eee5845 Merge pull request #67 from Citadel-Station-13/master
11/14
2020-11-14 09:23:15 -08:00
Artur f76c3e922c Comments out spacedmm should not sleeps 2020-11-13 15:18:00 +02:00
DeltaFire 9256804bd1 Unvy Ratvar 2020-11-12 21:40:32 +01:00
DeltaFire 9016abbbee *snap 2020-11-12 21:20:36 +01:00
DeltaFire d5993539b8 fixes vtec persisting after removal 2020-11-12 16:27:09 +01:00
DeltaFire b8741c3f07 Empty commit to rerun travis 2020-11-12 03:55:04 +01:00
Artur a4853561d3 Makes it reference the mind, not the body 2020-11-12 00:58:06 +02:00
DeltaFire d238d235c0 Merge remote-tracking branch 'upstream/master' into clock-rite-neutering-support 2020-11-11 19:31:15 +01:00
CitadelStationBot e8bd56a92d Automatic changelog generation for PR #13669 [ci skip] 2020-11-11 12:16:18 -06:00
siliconsandGitHub 0001a2edca Merge pull request #13669 from Arturlang/sacrifice_tweaks
Makes cult sacrifice not permakill people anymore.
2020-11-11 11:16:15 -07:00
siliconsandGitHub 0b6d2f8982 Merge pull request #13664 from Citadel-Station-13/exoframe
Donator - Exo Frame
2020-11-11 11:14:23 -07:00
siliconsandGitHub ee583cdc4e Merge pull request #13668 from timothyteakettle/age-verification
why is making the server make a note unnecessary cbt
2020-11-11 11:13:41 -07:00
Timothy Teakettle f950424785 more text changes 2020-11-10 16:00:19 +00:00
Timothy Teakettle 2115e14d22 typo 2020-11-10 15:48:49 +00:00
Timothy Teakettle 09035855e7 some qol 2020-11-10 15:48:11 +00:00
DeltaFire c9a5552100 support for hiding rites from neutered clockies 2020-11-10 15:36:55 +01:00
shellspeed1 7a0c0a0e04 You can now build floor bots with any toolbox 2020-11-09 21:24:45 -08:00