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

• 4de3075120 squashes defib runtime DragonTrance 2021-02-25 14:14:39 -07:00
• fdf8c8ed11 fixes sounds not playing in hydroponics trays DragonTrance 2021-02-25 13:34:13 -07:00
• 6385f38d3e Merge branch 'master' of https://github.com/quotefox/Hyper-Station-13 QuoteFox 2021-02-25 11:15:19 +00:00
• 6de5347d1d valentines plant seeds QuoteFox 2021-02-25 11:15:14 +00:00
• 5bcfcd3d1a Flag fixes. Archie 2021-02-25 06:04:31 -03:00
• ac32223e0c And his music was electric Archie 2021-02-25 05:12:37 -03:00
• b58a0bddfc Merge pull request #997 from ArchieBeepBoop/teg QuoteFoxandGitHub 2021-02-25 07:10:08 +00:00
• f3e05543f5 Funny TEG Update Archie 2021-02-25 03:41:11 -03:00
• b73bf7add0 Merge pull request #996 from DragonTrance/cum-in-the-hot-tub QuoteFoxandGitHub 2021-02-25 06:38:55 +00:00
• 7a6eb052a5 Merge pull request #995 from DragonTrance/nightmare-objectives QuoteFoxandGitHub 2021-02-25 06:38:45 +00:00
• 4d55d53eaf typo DragonTranceandGitHub 2021-02-24 20:23:41 -07:00
• 7e4585297f funny cum-looking drink DragonTrance 2021-02-24 19:26:59 -07:00
• bbb8c81d81 light eater no longer eats plasmamen helmets DragonTrance 2021-02-24 18:35:32 -07:00
• 7bb205f940 nightmares have objectives now DragonTrance 2021-02-24 17:30:09 -07:00
• a8728cd91e Merge pull request #993 from DragonTrance/borg-cyropod QuoteFoxandGitHub 2021-02-24 09:41:00 +00:00
• dbb7ac71a1 Merge pull request #992 from lyricalpaws/master QuoteFoxandGitHub 2021-02-24 09:40:45 +00:00
• 3e84872b61 Merge pull request #991 from DragonTrance/plant-adding QuoteFoxandGitHub 2021-02-24 09:40:17 +00:00
• 3d8822850c Merge pull request #994 from DragonTrance/caelus-optimization QuoteFoxandGitHub 2021-02-24 09:40:01 +00:00
• 9211ab3b47 greatly improves aurora caelus performance DragonTrance 2021-02-24 00:39:06 -07:00
• 37c00d0481 Update cryopod.dm DragonTrance 2021-02-23 18:51:57 -07:00
• 310e21a0fa fixes icon typo DragonTrance 2021-02-23 17:57:03 -07:00
• 4a458797d4 Merge branch 'master' of github.com:lyricalpaws/Hyper-Station-13 Chloe Carver-Brown 2021-02-24 00:53:59 +00:00
• 86a391ec32 Patreon stuff Chloe Carver-Brown 2021-02-24 00:53:13 +00:00
• a1948ba882 Merge pull request #6 from quotefox/master ChloeandGitHub 2021-02-24 00:51:25 +00:00
• 25fb9040a1 Merge pull request #990 from DragonTrance/im-getting-thirsty QuoteFoxandGitHub 2021-02-24 00:45:17 +00:00
• 87204ff739 Update species.dm DragonTrance 2021-02-23 17:36:44 -07:00
• cd3ca2b8d1 sorting thirst code + not-water replenishes hydration DragonTrance 2021-02-23 17:19:06 -07:00
• 300b8bfc08 Merge pull request #989 from DragonTrance/mood-aa QuoteFoxandGitHub 2021-02-23 21:07:31 +00:00
• 5740825e1b only start fat DragonTrance 2021-02-23 14:04:34 -07:00
• b37e1db35e a DragonTrance 2021-02-23 13:55:15 -07:00
• ab941f0406 forgot one thing DragonTrance 2021-02-23 13:50:43 -07:00
• 15094b8b12 enjoy being fat with quirks! DragonTrance 2021-02-23 13:46:07 -07:00
• 99d2a0c4ee Merge pull request #987 from lyricalpaws/master QuoteFoxandGitHub 2021-02-23 19:56:55 +00:00
• 3f57139f8a Bazim Bazzam Chloe Carver-Brown 2021-02-23 19:14:29 +00:00
• e228770ff9 Merge pull request #5 from quotefox/master ChloeandGitHub 2021-02-23 18:02:27 +00:00
• 700b22988f Fixed a game breaking bug. Phew. QuoteFox 2021-02-22 23:18:16 +00:00
• 9dd61f3efb Pens now write on people, Harm intent to stab them like the old way. QuoteFox 2021-02-22 23:08:42 +00:00
• 4818d77ea4 Merge pull request #986 from DragonTrance/plant-adding QuoteFoxandGitHub 2021-02-22 19:47:13 +00:00
• 9b8fc88089 datum + typo DragonTrance 2021-02-22 12:43:58 -07:00
• f70a3f8277 botany fixes DragonTrance 2021-02-22 12:21:39 -07:00
• 506f6b19be Thirst, mood buff for qunching, No longer spawn thirsty, no longer suicidal if starving and dehydrated alone. QuoteFox 2021-02-22 19:12:01 +00:00
• b1dbf03769 Merge pull request #985 from TotallyNotADog/fixKitchenTables QuoteFoxandGitHub 2021-02-22 06:06:03 +00:00
• 3baa2f395a stupid bar tables again TotallyNotADog 2021-02-21 23:50:08 -06:00
• 3ca1dfecda Merge pull request #984 from DragonTrance/plant-adding QuoteFoxandGitHub 2021-02-22 04:11:42 +00:00
• d7644adb8c hopefully fix DragonTrance 2021-02-21 21:10:33 -07:00
• 4c8865bbd3 ashtray now holds cig butts QuoteFox 2021-02-22 01:45:29 +00:00
• 1c509bd31e Roleplay Warning smite. QuoteFox 2021-02-22 00:54:05 +00:00
• 711e52cc09 compile errors fixed. QuoteFox 2021-02-21 23:54:50 +00:00
• 973e45e102 Merge pull request #983 from DragonTrance/plant-adding QuoteFoxandGitHub 2021-02-21 23:08:24 +00:00
• 3da00de2cd opaque > transparent DragonTrance 2021-02-21 14:22:46 -07:00
• ad2b9d452c Merge pull request #982 from Kharkov72/sign QuoteFoxandGitHub 2021-02-21 21:13:07 +00:00
• 09038b7659 Merge branch 'plant-adding' of https://github.com/DragonTrance/Hyper-Station-13 into plant-adding DragonTrance 2021-02-21 12:09:21 -07:00
• aac2f47e38 i hope to god this doesnt make it conflicted again DragonTrance 2021-02-21 12:08:59 -07:00
• 3ebb7488de Merge branch 'master' into plant-adding DragonTranceandGitHub 2021-02-21 12:06:48 -07:00
• 0dea34de3a test DragonTrance 2021-02-21 12:03:05 -07:00
• 5e37c0d957 github please i beg you DragonTranceandGitHub 2021-02-21 11:45:07 -07:00
• 18b188f46e conflicts DragonTrance 2021-02-21 11:42:04 -07:00
• 2c5752fbe0 testing to see if this affects conflicts DragonTrance 2021-02-21 11:12:23 -07:00
• 84d8e1a44f Update organic.dm DragonTranceandGitHub 2021-02-21 11:01:51 -07:00
• c729c61765 added tons of botany changes from citadel (not instability) DragonTrance 2021-02-21 09:57:29 -07:00
• 24cb27b67c #5 DragonTrance 2021-02-21 08:37:10 -07:00
• 7d7c6fedc9 asay notifications QuoteFox 2021-02-21 11:40:02 +00:00
• 8e12eae0f3 fix patreon reward QuoteFox 2021-02-21 11:08:37 +00:00
• d24bafb858 Removed "Your back is feeling a little sore" and useless titty messages. QuoteFox 2021-02-21 10:57:58 +00:00
• 4e2d9a3bd0 I cannot let this go unadded Kharkov72 2021-02-21 00:53:05 -05:00
• 143fce334f Merge pull request #981 from lyricalpaws/master QuoteFoxandGitHub 2021-02-20 18:42:14 +00:00
• 63063ecd9b It liiiiiives Chloe Carver-Brown 2021-02-20 14:48:12 +00:00
• 3bff1b5a64 Merge pull request #4 from quotefox/master ChloeandGitHub 2021-02-20 14:22:10 +00:00
• 1326cf32eb Merge pull request #980 from lyricalpaws/clustaur QuoteFoxandGitHub 2021-02-20 06:32:18 +00:00
• 940a6b0ade Merge pull request #979 from lyricalpaws/master QuoteFoxandGitHub 2021-02-20 06:31:59 +00:00
• 10f7bafdd4 Merge pull request #978 from Chemlight/AI-time-lock QuoteFoxandGitHub 2021-02-20 00:50:51 +00:00
• a38a978f70 Revert "Poggers" Chloe Carver-Brown 2021-02-19 23:35:57 +00:00
• 6d8d602907 Adding clustaur grenades Chloe Carver-Brown 2021-02-19 23:21:12 +00:00
• 4195e0bd72 Merge pull request #3 from quotefox/master ChloeandGitHub 2021-02-19 22:23:08 +00:00
• 389291b46a Poggers Chloe Carver-Brown 2021-02-19 22:19:12 +00:00
• 600e329216 Time requirement on AI Chemlight 2021-02-19 03:30:27 -08:00
• c679a26897 Merge pull request #977 from Chemlight/Testing-whitelisting-items DahlularandGitHub 2021-02-15 23:47:01 -07:00
• 9753c7e7bc Merge pull request #976 from lyricalpaws/master DahlularandGitHub 2021-02-15 23:46:21 -07:00
• 0699845118 Makes the sec eyepatch flashproof and use glasses Chloe Carver-Brown 2021-02-16 04:23:20 +00:00
• eccf7b3237 Update _glasses.dm ChloeandGitHub 2021-02-16 00:41:49 +00:00
• e9390a0f64 Struggling with how the ckeywhitelist wants to work Chemlight 2021-02-15 16:25:54 -08:00
• 5ed5ebc96b Merge branch 'master' of github.com:lyricalpaws/Hyper-Station-13 Chloe Carver-Brown 2021-02-15 23:50:57 +00:00
• c1c9b3bba2 Poggers Chloe Carver-Brown 2021-02-15 23:47:04 +00:00
• 799914e37a Merge pull request #2 from quotefox/master ChloeandGitHub 2021-02-15 15:10:37 +00:00
• ecac8f739a Merge pull request #975 from Chemlight/Enzo-Plush QuoteFoxandGitHub 2021-02-14 22:52:53 +00:00
• e24137e60b Merge pull request #974 from ToonClyde/fix QuoteFoxandGitHub 2021-02-14 22:52:45 +00:00
• c9341c27a5 Merge pull request #973 from VladinXXV/cupid QuoteFoxandGitHub 2021-02-14 22:52:27 +00:00
• c444b521e5 Compile error fix. QuoteFox 2021-02-14 22:11:09 +00:00
• 794f3dedbd hunger fixes, Water SHOULD HYDRATE NOW QuoteFox 2021-02-14 15:33:43 +00:00
• 406549dd6b A quick coding test Chemlight 2021-02-13 21:10:51 -08:00
• 82bc29ba7f bar, kitchen, and hallway tweak ToonClyde 2021-02-13 20:54:52 -07:00
• 1bfe8bb816 love in the air Vladin 2021-02-13 21:51:56 -05:00
• 29237e5f8a Merge pull request #972 from Enzo-Leon/maps2 QuoteFoxandGitHub 2021-02-13 23:34:20 +00:00
• 383a51856d Map Adjustments Anthony Rodriguez 2021-02-13 15:17:41 -08:00
• ab9313cf42 Merge pull request #971 from Chemlight/Enzo-Plush QuoteFoxandGitHub 2021-02-13 23:00:45 +00:00
• 659f3b7885 Donator items for Enzo_Leon Chemlight 2021-02-13 14:56:45 -08:00
• b0fbee45e8 Merge pull request #970 from quotefox/thirst QuoteFoxandGitHub 2021-02-13 15:09:16 +00:00
• 3a88f7bfcc syndicates vendors are now free QuoteFox 2021-02-13 15:08:56 +00:00
• f698f16e27 Thirst System QuoteFox 2021-02-13 14:44:55 +00:00
• 8f3c7244fb Merge pull request #965 from DragonTrance/showers QuoteFoxandGitHub 2021-02-13 11:13:45 +00:00