Commit Graph

17155 Commits

Author SHA1 Message Date
DeltaFire15
ab81a7e3ef oops! (#13688) 2020-11-18 11:06:04 +01:00
silicons
3df485ad94 Merge pull request #13680 from DeltaFire15/hallucination-runtime-fix
Fixes a hallucination runtime
2020-11-17 01:13:33 -07:00
silicons
891d4ec76e Merge pull request #13681 from DeltaFire15/supplypod-shrapnel
Fixes a bunch of supplypod related stuff
2020-11-17 01:12:56 -07:00
silicons
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
silicons
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
silicons
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
silicons
157b2b6e2a Merge pull request #13665 from Citadel-Station-13/tgs-dmapi-update
Automatic TGS DMAPI Update
2020-11-17 01:10:03 -07:00
silicons
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
fbad172861 Merge remote-tracking branch 'upstream/master' into clock-rite-neutering-support 2020-11-16 04:30:15 +01:00
DeltaFire
185c8929b0 Merge remote-tracking branch 'upstream/master' into supplypod-shrapnel 2020-11-16 04:29:43 +01:00
DeltaFire
c225c29b45 Merge remote-tracking branch 'upstream/master' into hallucination-runtime-fix 2020-11-16 04:29:27 +01:00
silicons
9d7226cb4d Merge pull request #13670 from shellspeed1/master
Makes floor bots buildable with all toolboxes.
2020-11-15 17:12:37 -07:00
DeltaFire
3e19557e8f and more fixes. 2020-11-14 19:38:39 +01:00
DeltaFire
152a57be77 and another 2020-11-14 19:31:26 +01:00
DeltaFire
e0b2156142 fixes fixes fixes 2020-11-14 19:26:54 +01:00
DeltaFire
4dcb7a4a96 runtime fix 2020-11-14 17:36:13 +01: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
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
silicons
0001a2edca Merge pull request #13669 from Arturlang/sacrifice_tweaks
Makes cult sacrifice not permakill people anymore.
2020-11-11 11:16:15 -07:00
silicons
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
Artur
8ce058a593 Fixes stupid mistakes 2020-11-09 14:39:51 +02:00
Artur
503d0156c6 Does the thing 2020-11-08 23:24:58 +02:00
Timothy Teakettle
4db4fcb16e Update new_player.dm 2020-11-08 18:18:33 +00:00
LetterJay
f54eee63cc Merge pull request #13667 from timothyteakettle/age-verification
automated age verification uses a system note instead of an admin note
2020-11-08 11:58:34 -06:00
Timothy Teakettle
c90b197b00 different note 2020-11-08 17:51:51 +00:00
LetterJay
15834d3cdc Merge pull request #13666 from timothyteakettle/age-verification
heehoo typo
2020-11-08 11:34:58 -06:00
Timothy Teakettle
38e60025cf heehoo typo 2020-11-08 17:33:18 +00:00
LetterJay
10c90e06c1 Merge pull request #13661 from timothyteakettle/age-verification
adds in-game age verification as an alternative to access requests
2020-11-08 11:07:05 -06:00
Timothy Teakettle
29f1132d36 Update new_player.dm 2020-11-08 02:25:53 +00:00
Timothy Teakettle
5eaac21127 okay 2020-11-07 19:44:06 +00:00
Timothy Teakettle
68c0caf4fa better verification 2020-11-07 19:32:23 +00:00
silicons
7bce2115db Merge pull request #13642 from Citadel-Station-13/tgs-dmapi-update
Automatic TGS DMAPI Update
2020-11-07 00:33:36 -07:00
silicons
577cd537b3 Merge pull request #13654 from ArchieBeepBoop/giftfix
Christmas Tree / Jacqueen Gift Blacklist
2020-11-07 00:32:09 -07:00
silicons
6ed0563bab Merge pull request #13655 from timothyteakettle/haha-slip-go-brrr
fixes held items proccing crossed when passing someone
2020-11-07 00:31:07 -07:00
silicons
0c24740e95 Merge pull request #13656 from MrJWhit/more-time-for-canceling-events
More time for admins to cancel events
2020-11-07 00:30:40 -07:00
silicons
87e40f294b Merge pull request #13657 from DeltaFire15/transmission-sigil-fix
Fixes transmission sigil power drain
2020-11-07 00:30:27 -07:00
silicons
a00873a0ee Merge pull request #13658 from DeltaFire15/void-volt-tweaking
Changes to void volt and the clock power_drain() proc
2020-11-07 00:30:19 -07:00
silicons
173a1ef0f1 Merge pull request #13639 from Trilbyspaceclone/shhhh
More guns can be suppressed
2020-11-07 00:20:45 -07:00
silicons
cc56fc560e Merge pull request #13635 from Hatterhat/funny-hands-nerf
bone gauntlets bandaid nerf
2020-11-07 00:20:01 -07:00
silicons
77a1bdba0c Merge pull request #13630 from timothyteakettle/short-tall-quirks
character size scaling
2020-11-07 00:19:29 -07:00
silicons
2b273addf1 Merge pull request #13618 from Vynzill/mappinghell
new jungle gateway map
2020-11-07 00:19:11 -07:00