Commit Graph

  • 5366a09c8b Update spaceRuinBlacklist.txt zeroisthebiggay 2021-09-24 18:38:58 -04:00
  • c633c95919 Update space.dm zeroisthebiggay 2021-09-24 18:35:49 -04:00
  • 662807042d Update uplink_dangerous.dm zeroisthebiggay 2021-09-23 22:14:09 -04:00
  • 70cdd264dc Automatic changelog compile [ci skip] Changelogs 2021-09-24 00:26:31 +00:00
  • cbe221e18f Adds more blackbox stuff keronshb 2021-09-23 19:57:51 -04:00
  • c9697f4bbf Fixes dynamic keronshb 2021-09-23 19:38:15 -04:00
  • 0e3a522942 Fix. WanderingFox95 2021-09-24 01:02:45 +02:00
  • 84f1b6a7a4 these too WanderingFox95 2021-09-24 01:02:27 +02:00
  • f2075db4df put these in the wrong place. WanderingFox95 2021-09-24 01:02:17 +02:00
  • 9464ad8061 Merge branch 'Citadel-Station-13:master' into WanderingFox95-TribalOverhaul WanderingFox95 2021-09-24 00:59:57 +02:00
  • 7623ea9558 Automatic changelog generation for PR #15183 [ci skip] CitadelStationBot 2021-09-23 12:20:18 -05:00
  • 7ba7f0d1c1 gremlins become shock immune (#15183) zeroisthebiggay 2021-09-23 13:20:15 -04:00
  • a4adf41c7c Ups minimum lavaland temperature Putnam3145 2021-09-22 18:43:45 -07:00
  • fc73e2944f Automatic changelog compile [ci skip] Changelogs 2021-09-23 00:27:37 +00:00
  • 6cffeacd42 typo DeltaFire 2021-09-22 23:32:35 +02:00
  • 2e2aa36875 grab the ghost DeltaFire 2021-09-22 22:47:08 +02:00
  • 5b69a4680b whew DeltaFire 2021-09-22 22:36:36 +02:00
  • 7752e0d624 synthtissue and sr DeltaFire 2021-09-22 22:30:43 +02:00
  • ae4f7076dc Automatic changelog generation for PR #15187 [ci skip] CitadelStationBot 2021-09-22 14:50:30 -05:00
  • f8ac9af6d0 Merge pull request #15187 from KrabSpider/krabgenics Lin 2021-09-22 14:50:28 -05:00
  • e8617448ef Automatic changelog generation for PR #15190 [ci skip] CitadelStationBot 2021-09-22 14:50:00 -05:00
  • 4e9e98367f Merge pull request #15190 from buffyuwu/canvas Lin 2021-09-22 14:49:57 -05:00
  • cd20c2747a Merge branch 'Citadel-Station-13:master' into WanderingFox95-TribalOverhaul WanderingFox95 2021-09-22 12:39:46 +02:00
  • 2522b84667 ports a downstream fix of accordions buffyuwu 2021-09-22 01:56:13 -04:00
  • 989888fb24 Automatic changelog compile [ci skip] Changelogs 2021-09-22 00:26:18 +00:00
  • 271047cf9f Ninja Change keronshb 2021-09-21 17:42:02 -04:00
  • 44a4d4f496 Merge branch 'Citadel-Station-13:master' into master WanderingFox95 2021-09-21 14:56:38 +02:00
  • d8aa29a16e Merge branch 'Citadel-Station-13:master' into WanderingFox95-TribalOverhaul WanderingFox95 2021-09-21 14:49:15 +02:00
  • dbd6014129 adds art supplies to the fun vendor buffyuwu 2021-09-21 01:16:03 -04:00
  • f59bcedc30 updated green jacket buffyuwu 2021-09-21 01:09:39 -04:00
  • a81238f50d Automatic changelog generation for PR #15182 [ci skip] CitadelStationBot 2021-09-21 00:00:22 -05:00
  • ad4cb7ea0e Merge pull request #15182 from Citadel-Station-13/silicons-patch-3 Lin 2021-09-21 00:00:20 -05:00
  • c73455da7a Automatic changelog generation for PR #15181 [ci skip] CitadelStationBot 2021-09-20 23:59:56 -05:00
  • ab7b4e3eec Merge pull request #15181 from Citadel-Station-13/typecaches Lin 2021-09-20 23:59:53 -05:00
  • a084733397 Merge pull request #15179 from Citadel-Station-13/why Lin 2021-09-20 23:58:21 -05:00
  • 7a5e748344 Merge pull request #15185 from Citadel-Station-13/silicons-patch-6 Lin 2021-09-20 23:53:53 -05:00
  • ff64050f8a Automatic changelog generation for PR #15184 [ci skip] CitadelStationBot 2021-09-20 23:53:29 -05:00
  • 318a80370e Merge pull request #15184 from Citadel-Station-13/silicons-patch-5 Lin 2021-09-20 23:53:26 -05:00
  • 931ffd428f Update sound.dm zeroisthebiggay 2021-09-20 23:10:08 -04:00
  • baf4b90e0c lmao i love coding zerothebigboy 2021-09-20 22:58:39 -04:00
  • 8209a22ee3 🅰️ buffyuwu 2021-09-20 19:10:03 -04:00
  • eb43981dea adds 4 loadout jackets buffyuwu 2021-09-20 19:04:47 -04:00
  • 11a414d8c8 blacklists cryogenics from anomaly spawns KrabSpider 2021-09-20 16:41:40 -04:00
  • 9b3d8ab01e wowihatemapping zerothebigboy 2021-09-20 14:30:44 -04:00
  • 4205a559c5 Merge branch 'Citadel-Station-13:master' into WanderingFox95-TribalOverhaul WanderingFox95 2021-09-20 14:20:34 +02:00
  • 605aa0aa11 Automatic changelog compile [ci skip] Changelogs 2021-09-20 00:29:38 +00:00
  • d668c8f3be fixes gloves again WanderingFox95 2021-09-20 00:17:26 +02:00
  • c99df01c87 Merge branch 'Citadel-Station-13:master' into WanderingFox95-TribalOverhaul WanderingFox95 2021-09-20 00:16:27 +02:00
  • 0c3fd273c6 Add files via upload WanderingFox95 2021-09-20 00:16:19 +02:00
  • f2fe5d0c96 unsync WanderingFox95 2021-09-20 00:13:45 +02:00
  • c8814e8cc8 Merge remote-tracking branch 'upstream/master' into dynamicport keronshb 2021-09-19 18:09:18 -04:00
  • 6766e4380d Merge remote-tracking branch 'upstream/master' keronshb 2021-09-19 18:08:29 -04:00
  • cd00d1589e fucking hell keronshb 2021-09-19 18:06:24 -04:00
  • 204867763b Merge branch 'master' into silicons-patch-1 silicons 2021-09-19 15:00:30 -07:00
  • 13323d2597 Merge branch 'master' into dynamicport keronshb 2021-09-19 17:59:09 -04:00
  • 0b5a7c9759 OOPS FORGOT PIRATES and some blacklists keronshb 2021-09-19 17:56:26 -04:00
  • 433a92908e Automatic changelog generation for PR #14219 [ci skip] CitadelStationBot 2021-09-19 16:54:39 -05:00
  • e06926899d Merge pull request #14219 from zeroisthebiggay/ninjasarecum silicons 2021-09-19 14:54:37 -07:00
  • 6d99bca184 Update obj_defense.dm silicons 2021-09-19 14:46:09 -07:00
  • 84a26eeabd Update obj_defense.dm silicons 2021-09-19 14:45:24 -07:00
  • bbdd87671b repushing to maybe fix the diff bot? WanderingFox95 2021-09-19 22:48:36 +02:00
  • 17cd5c5d84 Update mobs.dm silicons 2021-09-19 13:46:08 -07:00
  • 7fce515ca4 Update robot_modules.dm zeroisthebiggay 2021-09-19 16:01:29 -04:00
  • 4ab88cfcdb Update robot_modules.dm zeroisthebiggay 2021-09-19 15:59:45 -04:00
  • 2f903353a6 Update robot_modules.dm zeroisthebiggay 2021-09-19 15:56:40 -04:00
  • a426388597 And inhands WanderingFox95 2021-09-19 21:33:51 +02:00
  • 0d6fe67bd5 Okay, now Tool sprites, please work. WanderingFox95 2021-09-19 21:33:24 +02:00
  • fe8a652689 Merge branch 'Citadel-Station-13:master' into WanderingFox95-TribalOverhaul WanderingFox95 2021-09-19 21:32:03 +02:00
  • a0cdc8abb7 please WanderingFox95 2021-09-19 21:31:58 +02:00
  • 03704c054a Update tgstation.dme zeroisthebiggay 2021-09-19 15:31:34 -04:00
  • 859363818c please work WanderingFox95 2021-09-19 21:31:22 +02:00
  • 9403fa3b3e Fix? WanderingFox95 2021-09-19 21:28:46 +02:00
  • e5b2ab19c0 Update tgstation.dme zeroisthebiggay 2021-09-19 15:27:51 -04:00
  • d6516d25de Update tgstation.dme zeroisthebiggay 2021-09-19 15:27:23 -04:00
  • 45602efbbf Now? WanderingFox95 2021-09-19 21:26:46 +02:00
  • 42eee00aec Fix? WanderingFox95 2021-09-19 21:25:51 +02:00
  • ce43b1b49e Merge branch 'ninjasarecum' of https://github.com/zeroisthebiggay/Citadel-Station-13 into ninjasarecum zerothebigboy 2021-09-19 15:25:42 -04:00
  • c6ce359cda Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum zerothebigboy 2021-09-19 15:23:52 -04:00
  • dce9801616 another slab gone WanderingFox95 2021-09-19 20:42:16 +02:00
  • 62ab6e4fb6 removes the slabs on more up to date maps? WanderingFox95 2021-09-19 20:41:39 +02:00
  • b752cb0af2 Update parts.dm silicons 2021-09-19 11:38:12 -07:00
  • c9662f76ed Update parts.dm silicons 2021-09-19 11:35:52 -07:00
  • 3d74fecfe1 And another fix? WanderingFox95 2021-09-19 20:34:47 +02:00
  • 992ec4c2a8 Sprite update? WanderingFox95 2021-09-19 20:33:53 +02:00
  • 5aea7175ea Automatic changelog generation for PR #15074 [ci skip] CitadelStationBot 2021-09-19 13:12:05 -05:00
  • c60e54e0d3 Merge pull request #15074 from keronshb/paiports silicons 2021-09-19 11:12:02 -07:00
  • c4386c0a4f Merge pull request #15175 from buffyuwu/hallucination silicons 2021-09-19 11:11:05 -07:00
  • eff5f97020 Automatic changelog generation for PR #15174 [ci skip] CitadelStationBot 2021-09-19 13:10:47 -05:00
  • f48bf3cdc0 Merge pull request #15174 from buffyuwu/holoparasites silicons 2021-09-19 11:10:45 -07:00
  • 88428d248b Automatic changelog generation for PR #15133 [ci skip] CitadelStationBot 2021-09-19 13:10:31 -05:00
  • 2c8d362dd5 Merge pull request #15133 from zeroisthebiggay/patch-21 silicons 2021-09-19 11:10:28 -07:00
  • da2ca355f1 Automatic changelog generation for PR #15094 [ci skip] CitadelStationBot 2021-09-19 13:09:57 -05:00
  • 8d914571e8 Merge pull request #15094 from zeroisthebiggay/patch-20 silicons 2021-09-19 11:09:55 -07:00
  • 608cb77919 Automatic changelog generation for PR #15176 [ci skip] CitadelStationBot 2021-09-19 13:09:09 -05:00
  • a40acd3cd6 Merge pull request #15176 from buffyuwu/dogborgsleeper silicons 2021-09-19 11:09:06 -07:00
  • 20feb1b3aa Automatic changelog generation for PR #15178 [ci skip] CitadelStationBot 2021-09-19 13:09:03 -05:00
  • 97213c94d8 Merge pull request #15178 from zeroisthebiggay/soup silicons 2021-09-19 11:09:01 -07:00
  • ae1b7803fa Merge pull request #15172 from Putnam3145/bonfire-always-works-lavaland silicons 2021-09-19 11:08:56 -07:00
  • e4f610b1e8 Automatic changelog generation for PR #15171 [ci skip] CitadelStationBot 2021-09-19 13:08:48 -05:00
  • 9a393e07f8 Merge pull request #15171 from DeltaFire15/ventcrawl-I-want-to-cry silicons 2021-09-19 11:08:45 -07:00