Commit Graph

Select branches

Hide Pull Requests

Gatofication

clothes

floral_update

gatostation

lil-upgrades

master

revert-168-gatostation

revert-194-master

revert-275-FactorioFeeding

small-tweaks-again

small_tweaks

world-detailing

#1

#10

#100

#101

#102

#103

#104

#105

#106

#107

#108

#109

#11

#110

#111

#112

#113

#114

#115

#116

#117

#118

#119

#12

#120

#121

#122

#123

#124

#125

#126

#127

#128

#129

#13

#130

#131

#132

#133

#134

#135

#136

#137

#138

#139

#14

#140

#141

#142

#143

#144

#145

#146

#147

#148

#149

#15

#150

#151

#152

#153

#154

#155

#156

#157

#158

#159

#16

#160

#161

#162

#163

#164

#165

#166

#167

#168

#169

#17

#170

#171

#172

#173

#174

#175

#176

#177

#178

#179

#18

#180

#181

#182

#183

#184

#185

#186

#187

#189

#19

#190

#191

#192

#193

#194

#195

#196

#197

#198

#199

#2

#20

#200

#201

#202

#203

#204

#205

#206

#207

#208

#209

#21

#210

#211

#212

#213

#214

#215

#216

#217

#218

#219

#22

#220

#221

#222

#223

#224

#225

#226

#227

#228

#229

#23

#230

#231

#232

#233

#234

#235

#236

#237

#238

#239

#24

#240

#241

#242

#243

#244

#245

#246

#247

#248

#249

#25

#250

#251

#252

#253

#254

#255

#256

#257

#258

#259

#26

#260

#261

#262

#263

#264

#265

#266

#267

#268

#269

#27

#270

#271

#272

#273

#274

#275

#276

#277

#278

#279

#28

#280

#281

#282

#29

#3

#30

#31

#32

#33

#34

#35

#36

#37

#38

#39

#4

#40

#41

#42

#43

#44

#45

#46

#47

#48

#49

#5

#50

#51

#52

#53

#54

#55

#56

#57

#58

#59

#6

#60

#61

#62

#63

#64

#65

#66

#67

#68

#69

#7

#70

#71

#72

#73

#74

#75

#76

#77

#78

#79

#8

#80

#81

#82

#83

#84

#85

#86

#87

#88

#89

#9

#90

#91

#92

#93

#94

#95

#96

#97

#98

#99

Mono Color

• d48c2d6e89 Megafauna spawning change DragonTrance 2020-11-04 12:01:56 -07:00
• 7524cf8927 Merge pull request #651 from ArchieBeepBoop/herewego2 DahlularandGitHub 2020-11-04 02:33:36 -07:00
• c39beb140f Merge pull request #655 from ArchieBeepBoop/sentientanimalsfix DahlularandGitHub 2020-11-04 02:30:51 -07:00
• ea5b9ca4ef Junior roles JaySparrow 2020-11-04 00:37:23 -06:00
• 93f79c20f6 blacklist some animals from being targeted by sentience events Dip 2020-11-03 19:35:21 -03:00
• 9bdbfe430f synthblood missing recipe Dip 2020-11-03 04:55:00 -03:00
• 2557084af6 Paramedic Alt Title Dip 2020-11-03 04:47:55 -03:00
• 2b45cd536d adv hypo design Dip 2020-11-03 04:37:45 -03:00
• 2abf3a7022 forgot one thing JaySparrow 2020-11-03 00:47:23 -06:00
• d64ead68ac Merge branch 'master' into Dynamic2 JaySparrow 2020-11-03 00:39:13 -06:00
• 8d1ef78a58 buncha stuff JaySparrow 2020-11-03 00:35:55 -06:00
• 752a3d9bcc Merge pull request #9418 from Ghommie/Ghommie-cit216 kevinz000andDip 2019-10-07 23:36:11 -07:00
• 3a84791e6c Merge pull request #9380 from Ghommie/Ghommie_cit212 kevinz000andDip 2019-10-01 23:58:27 -07:00
• d29b0b75b0 Bump bl from 1.2.2 to 1.2.3 in /tgui dependabot[bot]andGitHub 2020-11-03 03:57:11 +00:00
• b2cf723067 Bump pillow from 5.1.0 to 7.1.0 in /tools/mapmerge2 dependabot[bot]andGitHub 2020-11-03 03:56:55 +00:00
• c7bc366210 Merge pull request #648 from ArchieBeepBoop/byehalloween DahlularandGitHub 2020-11-02 20:56:51 -07:00
• 21d973befa Merge pull request #647 from ArchieBeepBoop/herewegoagain DahlularandGitHub 2020-11-02 20:56:24 -07:00
• 65abd166ce Merge pull request #646 from ArchieBeepBoop/zlevelstuff DahlularandGitHub 2020-11-02 20:54:49 -07:00
• 996ad3b677 Merge pull request #645 from ArchieBeepBoop/giftfix DahlularandGitHub 2020-11-02 20:54:20 -07:00
• 60ab437ac8 Merge pull request #643 from Jay-Sparrow/Bug-fixin DahlularandGitHub 2020-11-02 20:53:26 -07:00
• 94e821137e bye Dip 2020-11-03 00:13:25 -03:00
• 5b96e008fe tinyfix Dip 2020-11-02 18:38:18 -03:00
• a86199c99f Merge pull request #9241 from Linzolle/oracleui kevinz000andDip 2019-09-13 10:46:11 -07:00
• b9822c235a Merge pull request #9234 from Trilbyspaceclone/reebee_redone kevinz000andDip 2019-10-10 02:09:21 -07:00
• eeb7b709bd new proc GhomandDip 2019-06-17 20:18:28 +02:00
• 70f60a02ab Merge pull request #8032 from deathride58/immersivetransitturfs kevinz000andDip 2019-02-27 16:02:58 -08:00
• c4680a7c28 the sequel Dip 2020-11-02 15:01:08 -03:00
• 8240f5d0a7 Big bits JaySparrow 2020-11-02 04:25:02 -06:00
• 164bff70bb Merge pull request #642 from ArchieBeepBoop/giftfix QuoteFoxandGitHub 2020-11-02 09:33:48 +00:00
• 8916a47eac let's fucking NOT Dip 2020-11-02 06:26:01 -03:00
• 02b0e4c690 Merge pull request #641 from Jay-Sparrow/Bug-fixin DahlularandGitHub 2020-11-02 01:40:20 -07:00
• c033072884 FUCK YOU LONE OP JaySparrow 2020-11-02 02:06:44 -06:00
• af6ff73c29 Merge pull request #639 from ArchieBeepBoop/fuckcluwnes DahlularandGitHub 2020-11-02 00:36:03 -07:00
• b2fb7d0d79 Merge pull request #640 from ArchieBeepBoop/revenant DahlularandGitHub 2020-11-01 20:08:59 -07:00
• 2713df2455 makes revenants less shit tm Dip 2020-11-01 22:15:41 -03:00
• 4e0ff0fd53 a Dip 2020-11-01 20:33:12 -03:00
• a8e8f24032 refactor Dip 2020-11-01 20:08:54 -03:00
• 0e65c65fc9 Merge pull request #635 from ArchieBeepBoop/bloodtypederp DahlularandGitHub 2020-11-01 15:16:09 -07:00
• c9c2894df8 Merge pull request #631 from VladinXXV/superiormedicine DahlularandGitHub 2020-11-01 15:15:43 -07:00
• 33fa23a13f Merge pull request #638 from ArchieBeepBoop/fuckcluwnes DahlularandGitHub 2020-11-01 15:14:34 -07:00
• 99044121aa Merge pull request #2 from Crashtest-LXXXIX/revert-1-lavaland-patch Crashtest-LXXXIXandGitHub 2020-11-01 22:13:29 +00:00
• 37d6ae38ea Revert "Lavaland ladders removed" Crashtest-LXXXIXandGitHub 2020-11-01 22:13:12 +00:00
• 6db43927c6 HAHA YEAH NO Dip 2020-11-01 19:12:21 -03:00
• c7c6b579d8 anotherone Dip 2020-11-01 19:10:07 -03:00
• 1603d884be Merge pull request #1 from Crashtest-LXXXIX/lavaland-patch Crashtest-LXXXIXandGitHub 2020-11-01 16:31:52 +00:00
• f765c72767 Lavaland ladders removed Crashtest-LXXXIXandGitHub 2020-11-01 16:30:57 +00:00
• 859dfd24f5 synthliz bloodtype Dip 2020-10-31 00:23:24 -03:00
• adb995f61a Merge pull request #633 from ArchieBeepBoop/fixes2 DahlularandGitHub 2020-10-30 16:30:19 -06:00
• ca0939c2f8 fixes the two broken autobottler designs Dip 2020-10-30 15:06:25 -03:00
• af751a7c41 Spooky meteors now only replace catastrophic Dip 2020-10-30 15:01:02 -03:00
• dcdc153369 fixed code comments to be accurate Vladin 2020-10-30 06:27:03 -04:00
• 5356c63bd5 Superior medicine is actually superior Vladin 2020-10-30 06:21:35 -04:00
• 1a207aed7e Merge pull request #630 from ArchieBeepBoop/newfood2 DahlularandGitHub 2020-10-30 02:49:08 -06:00
• 28cdb9c5f1 Oh no. GhomandDip 2019-12-23 02:31:50 +01:00
• b0a2ebdf3e Merge pull request #9960 from Ghommie/Ghommie-cit398 kevinz000andDip 2019-11-28 23:11:57 -07:00
• 6b6ace1726 drinkfix Dip 2020-10-30 04:21:03 -03:00
• ee0017721e Merge pull request #627 from ArchieBeepBoop/spooky DahlularandGitHub 2020-10-29 22:51:07 -06:00
• c567887a32 Merge pull request #628 from ArchieBeepBoop/cluwnereturn DahlularandGitHub 2020-10-29 22:48:50 -06:00
• 5f257c785b Merge pull request #629 from BoxyBoy/sizeCodeFixStuff DahlularandGitHub 2020-10-29 22:48:08 -06:00
• f508e0557b Better explanations BoxyBoy 2020-10-29 22:34:54 -06:00
• 75f967bd88 Character Size Examine Text BoxyBoy 2020-10-29 21:55:42 -06:00
• 4d64275e84 HARD return Dip 2020-10-30 00:04:59 -03:00
• 6b4d1268a2 Merge pull request #626 from ArchieBeepBoop/cargo4 DahlularandGitHub 2020-10-29 11:01:14 -06:00
• 9acf8ffd40 merge conflict drinks.dmi Dip 2020-10-29 13:50:19 -03:00
• bbbd52a4a4 Merge pull request #623 from ArchieBeepBoop/numbertwo DahlularandGitHub 2020-10-29 10:30:33 -06:00
• 78e1327bca Merge pull request #622 from ArchieBeepBoop/grill DahlularandGitHub 2020-10-29 10:28:36 -06:00
• 2395ba69c9 Merge pull request #616 from Kabramen/more-kink-machines DahlularandGitHub 2020-10-29 10:27:03 -06:00
• 512ab2bd14 Merge pull request #624 from ArchieBeepBoop/alert QuoteFoxandGitHub 2020-10-29 04:45:39 +00:00
• b55c5f05a9 Merge pull request #625 from ArchieBeepBoop/pipening QuoteFoxandGitHub 2020-10-29 04:44:34 +00:00
• 68665d2006 we're crashing the server with no survivors Dip 2020-10-28 17:09:46 -03:00
• 87611d624d PLEASE. Dip 2020-10-28 17:01:28 -03:00
• 1006fb3c7e mood runtime Dip 2020-10-28 16:57:47 -03:00
• 138b7a0aa0 this dullahan bullshit is going to make me kill myself Dip 2020-10-28 16:29:53 -03:00
• 731b38c975 Merge pull request #9683 from Ghommie/Ghommie-cit303 kevinz000andDip 2019-11-14 15:52:11 -07:00
• 435aa3180f Merge pull request #9649 from Thalpy/JacqFixes BlackMajorandDip 2019-10-29 21:48:35 +13:00
• 48051d5dd2 Merge pull request #9635 from Thalpy/JacqFixes kevinz000andDip 2019-10-27 16:41:06 -07:00
• fa655a1b78 Merge pull request #9456 from Thalpy/Spookytime kevinz000andDip 2019-10-15 23:11:35 -07:00
• 82daa9b75e Merge pull request #9709 from Trilbyspaceclone/cargo_memes_3 kevinz000andDip 2019-11-10 11:30:33 -07:00
• 45f7b020c4 Merge pull request #9628 from Trilbyspaceclone/Cargo_MKII kevinz000andDip 2019-11-14 16:00:45 -07:00
• 89aa5852c8 Merge pull request #9226 from Trilbyspaceclone/unmodular_2 kevinz000andDip 2019-10-08 00:30:54 -07:00
• 727b826d1b better sprites Dip 2020-10-27 13:34:12 -03:00
• f1f89cbb50 Merge pull request #9147 from Code-Cygnet/The-Art-of-Drunken-Captaining kevinz000andDip 2019-09-10 22:06:36 -07:00
• 4a9d6a82ce Merge pull request #9542 from Trilbyspaceclone/patch-231 kevinz000andDip 2019-10-24 18:51:34 -07:00
• 071f1cc6af Merge pull request #9198 from Trilbyspaceclone/A_Tailer's_art kevinz000andDip 2019-10-22 23:11:56 -07:00
• 2983dfa445 Merge pull request #9211 from Trilbyspaceclone/Cargo_rebalance kevinz000andDip 2019-10-17 13:09:55 -07:00
• fb7f3be4e4 icon layer Dip 2020-10-27 16:58:33 -03:00
• 2ae2449f4b the pipening Dip 2020-10-27 16:34:53 -03:00
• e7f549b57e A proper alert for ghost role character appearance loading Dip 2020-10-27 15:50:24 -03:00
• 2c7c66fc89 Merge pull request #9589 from Ghommie/Ghommie-cit259 kevinz000andDip 2019-10-24 18:38:15 -07:00
• 6fe0f126b1 better sprites Dip 2020-10-27 13:34:12 -03:00
• 7034e00e1c Merge pull request #9147 from Code-Cygnet/The-Art-of-Drunken-Captaining kevinz000andDip 2019-09-10 22:06:36 -07:00
• 23c4a9be17 Merge pull request #617 from ArchieBeepBoop/cluwnef QuoteFoxandGitHub 2020-10-27 02:37:38 +00:00
• 1985f84ac8 Merge pull request #618 from ArchieBeepBoop/funnygenerator QuoteFoxandGitHub 2020-10-27 02:36:46 +00:00
• 9c13864b8b Merge pull request #615 from ArchieBeepBoop/pets QuoteFoxandGitHub 2020-10-27 02:36:23 +00:00
• 88bf85f2ea Merge pull request #619 from ArchieBeepBoop/fixesyee QuoteFoxandGitHub 2020-10-27 02:35:50 +00:00
• 6d9b78d4e6 Merge pull request #620 from ArchieBeepBoop/penfix QuoteFoxandGitHub 2020-10-27 02:35:32 +00:00
• 653c79a0a8 Merge pull request #621 from ToonClyde/CitRP-jackets QuoteFoxandGitHub 2020-10-27 02:35:19 +00:00
• 4207015199 CitRP Fluffy Jackets ToonClyde 2020-10-26 14:30:59 -07:00
• 6abb884fa4 fixes the sleepy pen and an invalid reagent Dip 2020-10-26 18:11:06 -03:00
• d9db5e0aa9 Merge pull request #9246 from Linzolle/taur deathride58andDip 2019-10-21 21:19:05 -04:00