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

• b3d3515d69 Merge pull request #435 from ArchieBeepBoop/gitignore_fix DahlularandGitHub 2020-09-06 11:57:48 -06:00
• 49d7eeb197 Merge remote-tracking branch 'upstream/master' Dip 2020-09-06 14:35:22 -03:00
• a3d6a55dda add admins.txt to gitignore Dip 2020-09-06 14:31:22 -03:00
• 5cddfc861e Who are you? Where am I? Vladin AmporaandGitHub 2020-09-06 05:23:02 -04:00
• 9426ef6d30 Merge pull request #6 from quotefox/master Vladin AmporaandGitHub 2020-09-06 01:37:52 -04:00
• 1dd2bf8434 more gitignore Dip 2020-09-06 02:22:10 -03:00
• 8f072b1358 Merge pull request #432 from TotallyNotADog/FIXTHETALLBOOTSFUCK DahlularandGitHub 2020-09-05 20:05:19 -06:00
• 7c2cfc65c8 FUCK WHY DID I NOT NOTICE THIS Unknown 2020-09-05 21:03:42 -05:00
• 6d49f6e9b3 Merge pull request #424 from TotallyNotADog/slaveImplant DahlularandGitHub 2020-09-05 19:15:08 -06:00
• c9ee9cde26 Revert "Adds a sec bed with special name + desc to HoS office" Unknown 2020-09-05 03:21:52 -05:00
• 339e0d9e0f slutcurity hailer sub mode Unknown 2020-09-05 18:37:14 -05:00
• 4e272b9cf4 blue yeen's request Unknown 2020-09-05 17:13:33 -05:00
• bcc1848449 Merge pull request #431 from ToonClyde/Bridge-pipe-fix DahlularandGitHub 2020-09-05 05:30:12 -06:00
• 5f7d9c3b6e fix the bridges pipes yes ToonClyde 2020-09-05 04:24:55 -07:00
• 8e2f6468ec Merge pull request #428 from ToonClyde/box-dorm-rework DahlularandGitHub 2020-09-05 04:35:18 -06:00
• 9053906f40 Dahl wanted a punching bag ToonClyde 2020-09-05 03:33:26 -07:00
• 05c92fd895 Merge pull request #430 from Fabian272/master DahlularandGitHub 2020-09-05 04:07:17 -06:00
• 9fbb526b59 Merge pull request #429 from Shadow-Quill/XenoDigiLegs DahlularandGitHub 2020-09-05 03:10:35 -06:00
• 5779dd5d18 Update milking machine.dm Fabian272 2020-09-05 11:09:24 +02:00
• 9c746b9e52 Adds a sec bed with special name + desc to HoS office Unknown 2020-09-05 03:21:52 -05:00
• 84aafa49c5 adds tall jackboots, pink jumpsuit+skirt to loadout Unknown 2020-09-05 03:00:13 -05:00
• e6d3c18cfd Fix Shadow Quill 2020-09-05 02:44:14 -05:00
• b8d76bc301 fixes an error in the tall jackboots icon Unknown 2020-09-05 02:25:06 -05:00
• c3909dcf2d restores attack_paw() Unknown 2020-09-05 01:22:18 -05:00
• a62ea2b752 nerfs bitch breaker's suicide_act Unknown 2020-09-05 00:38:59 -05:00
• 4330bc4b13 security pet bed Unknown 2020-09-05 00:37:45 -05:00
• 6f04048e1b Xeno Digitigrade Leg Fix Shadow Quill 2020-09-05 00:37:42 -05:00
• 62cf36ddea fixes more merge conflict fuckery Unknown 2020-09-05 00:23:39 -05:00
• 79a1167f2d security pet bed Unknown 2020-09-05 00:20:31 -05:00
• 55230cb73d Merge remote-tracking branch 'origin/slaveImplant' into slaveImplant Unknown 2020-09-05 00:12:08 -05:00
• a37b290e13 riding crop Unknown 2020-09-05 00:08:25 -05:00
• 95891e97b0 fixes the corset not working Unknown 2020-09-05 00:02:05 -05:00
• cc7013f802 the bitch breaker Unknown 2020-09-04 23:53:15 -05:00
• 66d3400e9c the bitch breaker Unknown 2020-09-04 23:53:15 -05:00
• 46b6e9e832 holy fuck this is a lot Unknown 2020-09-04 23:30:11 -05:00
• 069f8a8582 Below on that pipe ToonClyde 2020-09-04 15:15:46 -07:00
• 1527edfa6b how could i forget the collars? Unknown 2020-09-04 15:07:49 -05:00
• fe68e382fa fixes jumpskirt and stripper outfit, adds to secdrobe Unknown 2020-09-04 14:08:46 -05:00
• 6134118402 patreon rewards! QuoteFox 2020-09-04 15:08:39 +01:00
• eac7de08f7 Update milking machine.dm Fabian272 2020-09-04 14:32:16 +02:00
• 853cf6952e a lot of fuckin clothes Unknown 2020-09-03 22:21:34 -05:00
• f4386b7e31 Merge remote-tracking branch 'upstream/master' Dip 2020-09-03 22:50:15 -03:00
• bb81fcc90d gitignore Dip 2020-09-03 22:49:47 -03:00
• a0b1d083ad Merge pull request #422 from ArchieBeepBoop/master DahlularandGitHub 2020-09-03 12:58:15 -06:00
• c02e28d020 Merge pull request #423 from Jay-Sparrow/master DahlularandGitHub 2020-09-03 12:57:25 -06:00
• 282a25142c Merge pull request #426 from TotallyNotADog/ropeUpdate DahlularandGitHub 2020-09-03 12:55:59 -06:00
• 5baa2cf2c5 can't make sec members sec slaves anymore Unknown 2020-09-03 00:57:39 -05:00
• bd1cd96aac if rope is so good, why isn't there a rope 2? Unknown 2020-09-02 20:05:05 -05:00
• 2500ae1d73 gosh darn gravity pressure!! ToonClyde 2020-09-02 15:49:17 -07:00
• 91301ca1cd generic messages for admin shenanigan use Unknown 2020-09-02 16:39:54 -05:00
• 1660fcf46a Pokemon Dorms & Gyms ToonClyde 2020-09-02 00:13:56 -07:00
• df0639cc74 whoops typos! Unknown 2020-09-01 21:50:37 -05:00
• 05f6b970fd slave objective respects lewdchem prefs Unknown 2020-09-01 21:17:27 -05:00
• 7e7848fa8b adds slave implant to techweb Unknown 2020-09-01 20:29:50 -05:00
• cc0f48df38 Status tab final fix Dip 2020-09-01 22:29:10 -03:00
• 1a500393fe dont want to enslave nonsentient stuff Unknown 2020-09-01 19:53:55 -05:00
• 5331c4a61d adds slave implant w/ basic functionality Unknown 2020-09-01 19:42:14 -05:00
• 78fc7ce945 Maybe fix for antag JaySparrow 2020-09-01 16:48:30 -05:00
• 4d3c98b639 Remove useless bit of code for status tab fix Dip 2020-08-31 21:29:46 -03:00
• 5aaf11b3d9 Merge pull request #421 from TotallyNotADog/ballgag DahlularandGitHub 2020-08-31 02:47:51 -06:00
• d4a7ace4cf Merge pull request #418 from ArchieBeepBoop/cake_patch DahlularandGitHub 2020-08-31 02:45:31 -06:00
• 90abd12a13 Merge pull request #420 from ToonClyde/pubby-wubby DahlularandGitHub 2020-08-31 02:43:28 -06:00
• 0c7b49d745 Merge pull request #387 from Jay-Sparrow/antags DahlularandGitHub 2020-08-31 02:41:58 -06:00
• 17c71e4761 Merge pull request #405 from Crashtest-LXXXIX/master DahlularandGitHub 2020-08-31 02:38:29 -06:00
• 261ee7a8b8 Merge pull request #416 from ArchieBeepBoop/bsql_fix DahlularandGitHub 2020-08-31 02:37:42 -06:00
• cadab7c519 mmmmph! Unknown 2020-08-30 18:12:18 -05:00
• f276a03264 gotta fix that pubby ToonClyde 2020-08-30 15:35:34 -07:00
• 225d062c31 why Dip 2020-08-30 15:57:54 -03:00
• 2efb34dee6 Merge pull request #417 from ToonClyde/so-much-to-fix-so-little-kenk DahlularandGitHub 2020-08-28 21:16:18 -06:00
• d063601817 more mistakes fixed ToonClyde 2020-08-28 19:03:49 -07:00
• 4ccc48b5e4 Crash debug fix for BSQL and configuration.dm Dip 2020-08-28 14:15:09 -03:00
• 0a8c927b2a Merge pull request #413 from ArchieBeepBoop/status_tab_patch DahlularandGitHub 2020-08-28 00:45:17 -06:00
• 66f1d66fe4 Merge pull request #415 from Jay-Sparrow/Bug-fixin DahlularandGitHub 2020-08-28 00:41:50 -06:00
• fced902de8 Merge pull request #414 from ToonClyde/Box-fix-up DahlularandGitHub 2020-08-28 00:40:56 -06:00
• e9bba2e1e7 AI time lock JaySparrow 2020-08-28 01:35:27 -05:00
• dfa7ec073e Smaller code footprint, fix internal blinking status Dip 2020-08-27 17:34:19 -03:00
• c79339c5b5 Durr plant ToonClyde 2020-08-27 13:33:13 -07:00
• 7a5e19055c Merge pull request #409 from ArchieBeepBoop/status_tab_patch QuoteFoxandGitHub 2020-08-27 07:50:10 +01:00
• d0e20eefb3 Merge pull request #411 from Oposshim/deus-ex DahlularandGitHub 2020-08-27 00:46:13 -06:00
• 2316fd16c8 Merge pull request #410 from Dahlular/nerfhammeragain DahlularandGitHub 2020-08-27 00:42:58 -06:00
• b6ea10089e Merge pull request #412 from ToonClyde/box-station-fix DahlularandGitHub 2020-08-27 00:40:24 -06:00
• 0d37a44f4b a metric box ton! ToonClyde 2020-08-26 19:15:51 -07:00
• 9dd397dbd2 Update snack.dm PossandGitHub 2020-08-26 18:12:39 -04:00
• 06067efe9d Update snack.dm PossandGitHub 2020-08-26 18:12:06 -04:00
• 4ad543ef57 soyfood Oposshim 2020-08-26 16:51:19 -04:00
• b90fe27b72 Merge pull request #395 from ArchieBeepBoop/hl_patch DahlularandGitHub 2020-08-25 22:59:19 -06:00
• d9289373e0 Merge pull request #408 from Versallion/These-shuttles-are-kinda-dangerous DahlularandGitHub 2020-08-25 22:56:59 -06:00
• 05a636f647 Makes Events Less Chaotic Dahlular 2020-08-25 22:42:48 -06:00
• e66785af28 Round Time fix (Finally!) And more status tab optimizations Dip 2020-08-25 22:06:38 -03:00
• 9a348179b5 Round two Versallion 2020-08-25 00:59:03 -05:00
• 92fe048823 1st round Versallion 2020-08-25 00:47:26 -05:00
• 9821bb326d Merge pull request #407 from ArchieBeepBoop/status_tab_patch QuoteFoxandGitHub 2020-08-25 04:41:39 +01:00
• 051364b295 time dilation removal + interval increase Dip 2020-08-24 23:58:20 -03:00
• b77a5533d8 Merge pull request #404 from ArchieBeepBoop/status_tab_patch QuoteFoxandGitHub 2020-08-24 04:46:09 +01:00
• fbb05ca26a Lowered Pirate Spawn Chance DahlularandGitHub 2020-08-21 22:33:51 -06:00
• aaabc39fb9 Nerf Grab Intent Hardstun DahlularandGitHub 2020-08-21 20:38:27 -06:00
• eb87066009 Merge pull request #406 from VladinXXV/VLAD-FIXES-YOUR-MILK DahlularandGitHub 2020-08-21 19:54:54 -06:00
• cf9fa5dc41 Merge pull request #5 from VladinXXV/VLAD-FIXES-YOUR-MILK Vladin AmporaandGitHub 2020-08-21 21:50:33 -04:00
• a6973b403f Update drink_reagents.dm Vladin AmporaandGitHub 2020-08-21 21:50:21 -04:00
• 7480ea6af6 Merge pull request #4 from quotefox/master Vladin AmporaandGitHub 2020-08-21 21:38:25 -04:00