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

• 152d2d33bb Fixes antagonists being unable to hear code phrases and responses DragonTrance 2021-05-08 18:58:36 -07:00
• 5b4fd2319f Merge pull request #1140 from DragonTrance/various-misc DahlularandGitHub 2021-05-08 18:53:51 -06:00
• 4938774f5a Blacklist Space Pirates and Swarmers from layenia DragonTrance 2021-05-08 17:47:00 -07:00
• d2bf2e81f9 Merge pull request #1139 from Dahlular/whoops DahlularandGitHub 2021-05-08 15:54:58 -06:00
• d407798288 blacklists swarmers (for now) Dahlular 2021-05-08 15:50:58 -06:00
• 81cb17f220 Merge pull request #1137 from RachelDoe/master DahlularandGitHub 2021-05-08 02:25:01 -06:00
• 3010993cd6 Merge pull request #1138 from Dahlular/flanneluwu DahlularandGitHub 2021-05-08 02:24:37 -06:00
• bee97fa7b4 Adds 4 different flannel types Dahlular 2021-05-08 02:20:31 -06:00
• a5c2b540b7 Fix TRAIT_HEAT not being removed correctly RachelDoeandGitHub 2021-05-08 09:46:05 +02:00
• cc590b11eb Merge pull request #1136 from DragonTrance/various-misc DahlularandGitHub 2021-05-07 19:22:58 -06:00
• c818afbd3a Merge pull request #1135 from ArchieBeepBoop/moremapfixes DahlularandGitHub 2021-05-06 18:12:56 -06:00
• 204c217c9f aaaaa Archie 2021-05-06 19:16:37 -03:00
• 235b03e781 Merge pull request #1134 from Dahlular/radfixes DahlularandGitHub 2021-05-06 16:01:25 -06:00
• 5292d32516 fixes strip club maint Dahlular 2021-05-06 16:00:36 -06:00
• 5e36b0fa8c Merge pull request #1133 from ArchieBeepBoop/pipenet QuoteFoxandGitHub 2021-05-06 09:27:59 +01:00
• 2eaf86525b Lower volume Archie 2021-05-06 05:25:08 -03:00
• 60f7015397 Merge pull request #1132 from ArchieBeepBoop/pipenet QuoteFoxandGitHub 2021-05-06 09:23:02 +01:00
• 0f38fbfdb2 RBMK Ambient sound Archie 2021-05-06 05:18:51 -03:00
• 29a6f292b8 Final Changes Archie 2021-05-06 04:40:07 -03:00
• 091dd82456 Minor fix Archie 2021-05-06 03:23:00 -03:00
• 4960c503d0 Merge pull request #1131 from Dahlular/fixies DahlularandGitHub 2021-05-05 23:41:34 -06:00
• 5a9687e3c6 balloon time Dahlular 2021-05-05 23:40:17 -06:00
• 0c9557c2d2 Update dynamic_rulesets_events.dm DragonTrance 2021-05-05 20:52:41 -07:00
• 3e4592d4b4 fixed events gosh DragonTrance 2021-05-05 20:39:05 -07:00
• 0aea87fa04 Merge pull request #1130 from ArchieBeepBoop/rmv DahlularandGitHub 2021-05-05 21:19:01 -06:00
• 4540558f12 Merge remote-tracking branch 'upstream/master' into rmv Archie 2021-05-06 00:13:29 -03:00
• 77856a1dbf Remove that too Archie 2021-05-06 00:13:16 -03:00
• d6ff6cf102 Merge pull request #1128 from ArchieBeepBoop/RBMK_Layenia DahlularandGitHub 2021-05-05 21:06:58 -06:00
• 430f0a0256 Merge pull request #1127 from ArchieBeepBoop/rmv DahlularandGitHub 2021-05-05 20:58:13 -06:00
• 2b63947804 Merge pull request #1126 from ArchieBeepBoop/RBMK_Branch_Simple DahlularandGitHub 2021-05-05 20:56:46 -06:00
• e829cbc493 Merge pull request #1129 from DragonTrance/various-misc DahlularandGitHub 2021-05-05 18:37:56 -06:00
• bd5fd2413c third time the charm QuoteFox 2021-05-06 00:14:17 +01:00
• 7635120f94 fleshlight bug fix QuoteFox 2021-05-05 23:09:09 +01:00
• 6c20edbc8f Pipeline issues. Archie 2021-05-05 17:54:20 -03:00
• da64ec70b2 Update dynamic_rulesets_events.dm DragonTrance 2021-05-05 13:05:02 -07:00
• 9227a3bd1d Update dynamic_rulesets_events.dm DragonTrance 2021-05-05 13:03:34 -07:00
• 4ce0c46d45 Update dynamic_rulesets_events.dm DragonTrance 2021-05-05 12:54:19 -07:00
• 18e540ffbc Nuclear Reactor added to Layenia Archie 2021-05-05 15:02:27 -03:00
• 051e3f2dae Remove leftover map forcing for the diner Archie 2021-05-05 14:54:54 -03:00
• 5e57fa38f6 Merge remote-tracking branch 'upstream/master' into RBMK_Branch_Simple Archie 2021-05-05 14:49:01 -03:00
• e935ad2527 Merge branch 'master' of https://github.com/quotefox/Hyper-Station-13 QuoteFox 2021-05-05 12:52:02 +01:00
• 6c2b1faa22 Portal fleshlight, now has impreg chances. QuoteFox 2021-05-05 12:51:55 +01:00
• d5b00a512e Merge pull request #1123 from lyricalpaws/station-pets-probably-fixed QuoteFoxandGitHub 2021-05-05 12:39:02 +01:00
• d44b22535e Merge pull request #1125 from lyricalpaws/QOL-shit-and-fuck QuoteFoxandGitHub 2021-05-05 12:38:28 +01:00
• ab473dd918 Merge pull request #1124 from lyricalpaws/cat-stuff-woo-oh-yeah QuoteFoxandGitHub 2021-05-05 12:37:41 +01:00
• 2965131634 Merge pull request #1122 from Kabramen/vaule QuoteFoxandGitHub 2021-05-05 12:37:05 +01:00
• 2bc7e5f992 Space Diner and Pad QuoteFox 2021-05-05 11:48:45 +01:00
• a43c5f6acb Reference add Archie 2021-05-05 07:30:33 -03:00
• 66a05257d7 Area exemption from grid check Archie 2021-05-05 06:07:38 -03:00
• 6b7cc08584 Color Vibrance Archie 2021-05-05 06:03:14 -03:00
• 62ef2caa27 Pipe optimisation + cable Archie 2021-05-05 05:39:29 -03:00
• 786ae9c539 The end of piss pool Archie 2021-05-05 04:46:18 -03:00
• be235948b7 Layenia Station - Nuclear Edition Archie 2021-05-05 04:43:34 -03:00
• 0867777fa0 Fuel rod rework + templates Archie 2021-05-05 04:41:07 -03:00
• da7d1d61e6 Mentor Ahelp QuoteFox 2021-05-05 08:34:48 +01:00
• 7d696c6b1a optimization good. QuoteFox 2021-05-05 08:00:21 +01:00
• cf2cda9365 Desc change. Archie 2021-05-05 01:26:18 -03:00
• 5620f0a9ae whoops. Archie 2021-05-05 01:25:23 -03:00
• e6b5742291 Improvements all around! Archie 2021-05-05 01:23:37 -03:00
• 55098e9c65 Woe, qol be upon ye Chloe Carver-Brown 2021-05-05 00:29:18 +01:00
• 9a29e21a66 *meow Chloe Carver-Brown 2021-05-04 22:52:24 +01:00
• ceb53b16f0 it just works Chloe Carver-Brown 2021-05-04 22:26:40 +01:00
• 9f12d0c371 Merge pull request #17 from quotefox/master ChloeandGitHub 2021-05-04 21:56:50 +01:00
• 7040bbd230 pleb QuoteFox 2021-05-04 18:17:16 +01:00
• 9fb9200459 make sure they are alive. QuoteFox 2021-05-04 17:57:17 +01:00
• ebce3afd96 Bounty Kabra_men 2021-05-04 13:05:37 -03:00
• 21a7c1098d Condom economy expasion Kabra_men 2021-05-04 12:01:54 -03:00
• 3e04eb9333 Merge pull request #1121 from ArchieBeepBoop/qdel2 QuoteFoxandGitHub 2021-05-04 15:47:12 +01:00
• bc0b11d62b bug fix ssd QuoteFox 2021-05-04 14:06:41 +01:00
• 38b2903260 SSD indicators and Status Indicator frame work QuoteFox 2021-05-04 13:57:39 +01:00
• c444126dae Progress Archie 2021-05-04 06:11:29 -03:00
• 91ff4e99d1 breakable and climbable railings QuoteFox 2021-05-04 10:09:05 +01:00
• bc4b16f5e3 Simplify Archie 2021-05-04 03:56:40 -03:00
• 607d0abbfd Update with master Archie 2021-05-04 03:28:10 -03:00
• 5cb0c57ad7 Merge pull request #1120 from ArchieBeepBoop/railingstuffagainlmao QuoteFoxandGitHub 2021-05-04 06:08:04 +01:00
• 7f2e213c92 Merge pull request #1119 from ArchieBeepBoop/ezdronefix QuoteFoxandGitHub 2021-05-04 06:07:43 +01:00
• f3a4c96da6 Removes some references and adds one. Archie 2021-05-03 20:31:01 -03:00
• 7c2c5cb587 Well then. Railing fixes. Archie 2021-05-03 18:37:22 -03:00
• ad053b2513 AHEM Archie 2021-05-03 17:41:12 -03:00
• 27a56fc6fb Drones aren't glasses, they're hats. Archie 2021-05-03 06:08:22 -03:00
• 03b7879b81 Revert "Merge pull request #1094 from ArchieBeepBoop/maptick" QuoteFox 2021-05-03 01:01:08 +01:00
• c6e0f0df28 Merge pull request #1118 from ToonClyde/a-few-tweaks-here-and-there QuoteFoxandGitHub 2021-05-02 08:30:51 +01:00
• 785d5e2fe6 Merge pull request #1094 from ArchieBeepBoop/maptick QuoteFoxandGitHub 2021-05-02 08:30:40 +01:00
• ed5e33db04 Merge pull request #1117 from ArchieBeepBoop/densemotherfucker QuoteFoxandGitHub 2021-05-02 08:30:25 +01:00
• 5828c86ee9 Merge pull request #1115 from DragonTrance/sizecood-thingy QuoteFoxandGitHub 2021-05-02 08:29:52 +01:00
• eacd3a54b6 fixed missing pipe ToonClyde 2021-05-02 00:16:55 -07:00
• d8afa4c4d3 a few tweaks and fixes ToonClyde 2021-05-01 21:08:30 -07:00
• 9ef890d2f8 lmaono Archie 2021-05-02 00:19:38 -03:00
• 6224bcd199 Fixes Railings and Rods Archie 2021-05-02 00:09:59 -03:00
• db678a35c5 view your bigness as smolness DragonTrance 2021-05-01 18:57:17 -07:00
• 413a70607e Merge pull request #1114 from ArchieBeepBoop/densemotherfucker QuoteFoxandGitHub 2021-05-02 02:55:36 +01:00
• c2b8a2ad8b Merge pull request #1113 from ToonClyde/moving-the-burn-chamber-in-engineering QuoteFoxandGitHub 2021-05-02 02:55:08 +01:00
• e613c255bb Merge pull request #1111 from DragonTrance/various-misc QuoteFoxandGitHub 2021-05-02 02:55:00 +01:00
• 8b22f765a5 removes railing and cloud density Archie 2021-05-01 22:40:22 -03:00
• d1784b9226 fixed some pipes ToonClyde 2021-05-01 16:24:51 -07:00
• 8b21f90eaa moved the burn chamber ToonClyde 2021-05-01 15:50:20 -07:00
• 33c7131f01 Merge pull request #1112 from ArchieBeepBoop/opfix DahlularandGitHub 2021-05-01 13:42:02 -06:00
• 5b25ba1369 Lone Op Layenia Spawn Fix Archie 2021-05-01 16:34:29 -03:00
• b9cac11e92 Merge branch 'master' into various-misc DragonTranceandGitHub 2021-05-01 10:31:15 -07:00
• 31290bbfe6 quirks are now categorized, i hate byond DragonTrance 2021-05-01 10:23:37 -07:00