Commit Graph

39314 Commits

Author SHA1 Message Date
CitadelStationBot
e2fe97e86a Automatic changelog generation for PR #13644 [ci skip] 2020-11-17 02:09:51 -06: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
CitadelStationBot
bf69245a58 Automatic changelog generation for PR #13670 [ci skip] 2020-11-15 18:12:40 -06: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
CitadelStationBot
d2f978d9f3 Automatic changelog generation for PR #13678 [ci skip] 2020-11-15 18:11:55 -06:00
silicons
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
silicons
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
SandPoot
00adf078b0 this is needed 2020-11-15 19:13:01 -03:00
SandPoot
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
silicons
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
EmeraldSundisk
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
EmeraldSundisk
00398cb45a Add files via upload 2020-11-14 15:14:53 -08:00
EmeraldSundisk
76b7b68730 Add files via upload 2020-11-14 13:40:39 -08:00
EmeraldSundisk
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
EmeraldSundisk
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
CitadelStationBot
e8bd56a92d Automatic changelog generation for PR #13669 [ci skip] 2020-11-11 12:16:18 -06: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
0b6d2f8982 Merge pull request #13664 from Citadel-Station-13/exoframe
Donator - Exo Frame
2020-11-11 11:14:23 -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
shellspeed1
7a0c0a0e04 You can now build floor bots with any toolbox 2020-11-09 21:24:45 -08:00
shellspeed1
6b4579d059 Update json_verifier.py 2020-11-09 19:32:14 -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
CitadelStationBot
4f0a39495e Automatic changelog generation for PR #13661 [ci skip] 2020-11-08 11:07:09 -06: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
Jay
e1c8d669d5 Exo frame donator 2020-11-07 10:23:14 -06: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
CitadelStationBot
87b1b46be8 Automatic changelog generation for PR #13653 [ci skip] 2020-11-07 01:32:26 -06:00
silicons
446feeb8f8 Merge pull request #13653 from MrJWhit/kilo-fixes
A few fixes to kilo
2020-11-07 00:32:23 -07:00
CitadelStationBot
e7a3d823d1 Automatic changelog generation for PR #13654 [ci skip] 2020-11-07 01:32:12 -06:00
silicons
577cd537b3 Merge pull request #13654 from ArchieBeepBoop/giftfix
Christmas Tree / Jacqueen Gift Blacklist
2020-11-07 00:32:09 -07:00
CitadelStationBot
693b6cfac1 Automatic changelog generation for PR #13655 [ci skip] 2020-11-07 01:31:10 -06: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
CitadelStationBot
4aee666d99 Automatic changelog generation for PR #13656 [ci skip] 2020-11-07 01:30:43 -06:00