Commit Graph

  • b3af424687 Update penis.dm silicons 2021-01-05 02:46:30 -07:00
  • 21bbbe6f2f Update breasts.dm silicons 2021-01-05 02:46:00 -07:00
  • 6269819c46 Update status_effects.dm silicons 2021-01-05 02:45:36 -07:00
  • 9551f67b5e Update chems.dm silicons 2021-01-05 02:44:57 -07:00
  • 1a49d9738a Update CogStation.dmm MrJWhit 2021-01-05 00:54:34 -05:00
  • 3fd72b9ec2 Update BoxStation.dmm MrJWhit 2021-01-04 20:33:36 -05:00
  • 518da2ea06 Update MetaStation.dmm TripleShades 2021-01-04 15:39:08 -08:00
  • ffe20839fe tweaks loss numbers Artur 2021-01-04 23:46:48 +02:00
  • 6388c3cf55 Blood bag delays Artur 2021-01-04 23:43:33 +02:00
  • 9e16df56aa Ding for prayers Artur 2021-01-04 23:23:55 +02:00
  • af3c8edf01 Small blob tweaks + fix keronshb 2021-01-04 12:32:41 -05:00
  • 619490b040 oops Fermi 2021-01-04 16:32:06 +00:00
  • fa9e066b71 Merged upstream fixes Fermi 2021-01-04 16:23:32 +00:00
  • 5b703e84a4 Merge branch 'master' into Dispencer-UI-change Fermi 2021-01-04 16:21:06 +00:00
  • c14beae1b9 Merge remote-tracking branch 'upstream/master' Fermi 2021-01-04 16:20:27 +00:00
  • d9047e458c Testing and bugfixes Fermi 2021-01-04 15:47:35 +00:00
  • 57cd698994 Tweaks and fixes. Should be freature complete now. Fermi 2021-01-04 13:40:26 +00:00
  • c7965d3b4a Pushing to review diff Fermi 2021-01-04 10:53:21 +00:00
  • fe4f184792 good night disky Xantholne 2021-01-04 03:50:43 -07:00
  • c937021b68 Update living_active_parry.dm silicons 2021-01-04 03:17:51 -07:00
  • 6650d3518a Mostly ports tgstation #54644; New roboticist labcoat sprites necromanceranne 2021-01-04 20:45:11 +11:00
  • 27b5c3957f Snip snip MrJWhit 2021-01-04 01:26:14 -05:00
  • 8b18d4b3c5 Automatic changelog generation for PR #13959 [ci skip] CitadelStationBot 2021-01-03 22:37:35 -06:00
  • d6d753e9f7 Merge pull request #13959 from necromanceranne/bokken_fixes silicons 2021-01-03 21:37:33 -07:00
  • 0fda694a52 A bunch of fixes for bokkens, renamed all references to 'ironwood' to 'steelwood', since I got confused. necromanceranne 2021-01-04 15:30:28 +11:00
  • cd5d558fad safety? what's that? Letter N 2021-01-04 11:57:12 +08:00
  • afd1e8b5a9 Automatic changelog generation for PR #13954 [ci skip] CitadelStationBot 2021-01-03 21:19:49 -06:00
  • a0d58cd18d Merge pull request #13954 from EmeraldSundisk/coglocks silicons 2021-01-03 20:19:46 -07:00
  • 37c3bbbd9c Fixing things and gui Fermi 2021-01-04 01:48:35 +00:00
  • b20607cb1a Update toolbox.dm zeroisthebiggay 2021-01-03 20:18:55 -05:00
  • f29a89c2da Automatic changelog generation for PR #13948 [ci skip] CitadelStationBot 2021-01-03 19:18:32 -06:00
  • 4c6cc24343 Merge pull request #13948 from necromanceranne/sheath_stuff silicons 2021-01-03 18:18:29 -07:00
  • 68c96108b9 Automatic changelog generation for PR #13955 [ci skip] CitadelStationBot 2021-01-03 19:15:03 -06:00
  • 3897463f0b Merge pull request #13955 from Chiirno/NightmareLightsout silicons 2021-01-03 18:15:00 -07:00
  • 81642a34a1 Automatic changelog generation for PR #13951 [ci skip] CitadelStationBot 2021-01-03 19:13:53 -06:00
  • 7357ae3bc0 Merge pull request #13951 from BlueWildrose/CompensatingForSomething silicons 2021-01-03 18:13:50 -07:00
  • 1c89963be0 Automatic changelog generation for PR #13947 [ci skip] CitadelStationBot 2021-01-03 19:12:59 -06:00
  • 8dfbf3eb87 Merge pull request #13947 from Chiirno/ChemmasterOutputFix silicons 2021-01-03 18:12:57 -07:00
  • da358fa60a Update mobs.dm silicons 2021-01-03 18:12:33 -07:00
  • f84e6bea01 Automatic changelog generation for PR #13932 [ci skip] CitadelStationBot 2021-01-03 19:11:20 -06:00
  • 092e7569c2 Merge pull request #13932 from shellspeed1/Ports-xeno-QOL-stuff silicons 2021-01-03 18:11:18 -07:00
  • 13afb10b08 Automatic changelog generation for PR #13934 [ci skip] CitadelStationBot 2021-01-03 19:11:13 -06:00
  • ccbfd4015e Merge pull request #13934 from shellspeed1/Ports-Navigation-Gigabeacon silicons 2021-01-03 18:11:10 -07:00
  • c4a0907a31 Automatic changelog generation for PR #13936 [ci skip] CitadelStationBot 2021-01-03 19:10:47 -06:00
  • b164d6e75b Merge pull request #13936 from BlueWildrose/hoodyhoodu silicons 2021-01-03 18:10:44 -07:00
  • cbce47388d Automatic changelog generation for PR #13938 [ci skip] CitadelStationBot 2021-01-03 19:10:09 -06:00
  • c3e4eed5c7 Merge pull request #13938 from timothyteakettle/funny-synths silicons 2021-01-03 18:10:06 -07:00
  • 9dd5d2c88f Automatic changelog generation for PR #13940 [ci skip] CitadelStationBot 2021-01-03 19:10:02 -06:00
  • c947dfdca5 Merge pull request #13940 from Chiirno/CargoParamedSuit silicons 2021-01-03 18:09:59 -07:00
  • 693b99edf2 Automatic changelog generation for PR #13941 [ci skip] CitadelStationBot 2021-01-03 19:09:53 -06:00
  • 2641332fb2 Merge pull request #13941 from Chiirno/ChemMixerHotfix silicons 2021-01-03 18:09:50 -07:00
  • 0581748282 Merge pull request #13942 from YakumoChen/power-sink silicons 2021-01-03 18:09:38 -07:00
  • c825174283 Automatic changelog generation for PR #13943 [ci skip] CitadelStationBot 2021-01-03 19:09:23 -06:00
  • 89913ebc18 Merge pull request #13943 from Hatterhat/imagine-modularizing silicons 2021-01-03 18:09:20 -07:00
  • 8e97f87f70 Automatic changelog generation for PR #13945 [ci skip] CitadelStationBot 2021-01-03 19:09:01 -06:00
  • d6bd5d4bac Merge pull request #13945 from DeltaFire15/synth-organ-printing silicons 2021-01-03 18:08:58 -07:00
  • de5e817692 Automatic changelog generation for PR #13946 [ci skip] CitadelStationBot 2021-01-03 19:08:42 -06:00
  • 0555756dde Merge pull request #13946 from uomo91/logfix silicons 2021-01-03 18:08:39 -07:00
  • f97d750909 Automatic changelog generation for PR #13950 [ci skip] CitadelStationBot 2021-01-03 19:08:17 -06:00
  • 64a5b99e63 Merge pull request #13950 from TripleShades/meta-medical silicons 2021-01-03 18:08:15 -07:00
  • d9d0763004 Automatic changelog generation for PR #13859 [ci skip] CitadelStationBot 2021-01-03 19:07:21 -06:00
  • 697619856c Merge pull request #13859 from timothyteakettle/unlockable-loadout-items silicons 2021-01-03 18:07:18 -07:00
  • 0bb0f89ca2 Update pen.dm silicons 2021-01-03 18:03:36 -07:00
  • 1a108cfb9a Merge remote-tracking branch 'upstream/master' Fermi 2021-01-03 17:45:18 +00:00
  • 3e813c1ecc Add files via upload EmeraldSundisk 2021-01-03 00:16:02 -08:00
  • 84d311e201 nightmare now oneshots glowshrooms, miner beacons, and console screens. Chiirno 2021-01-03 02:44:47 -04:00
  • c8ce23886c Update code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm shellspeed1 2021-01-02 22:10:36 -08:00
  • f1b7c4aea5 Update miscellaneous.dm Putnam3145 2021-01-02 17:30:06 -08:00
  • 79db7e0db5 Changed out lightswitch for extinguisher on Recovery Room outer wall; Replaced wall with Clean Hands poster with a drape; Added Nanomeds to surgery TripleShades 2021-01-02 16:00:49 -08:00
  • b3c1c69861 Merge pull request #13944 from Citadel-Station-13/silicons-patch-59 Lin 2021-01-02 16:17:24 +00:00
  • 6e060b13f5 all done Letter N 2021-01-02 20:17:19 +08:00
  • 64f9605b51 map conflict any% Letter N 2021-01-02 19:56:04 +08:00
  • 642c4a5806 erect up the config instead in case this situation comes up again. Blue Wildrose 2021-01-02 00:18:49 -07:00
  • 5961d09298 Update CogStation.dmm EmeraldSundisk 2021-01-01 23:08:21 -08:00
  • 291c0a0a22 Update Space_Station_13_areas.dm EmeraldSundisk 2021-01-01 22:46:36 -08:00
  • 98e3464604 Merge pull request #74 from Citadel-Station-13/master EmeraldSundisk 2021-01-01 22:34:38 -08:00
  • 843b1494b3 max penis size increased before being punished for having one Blue Wildrose 2021-01-01 23:01:39 -07:00
  • f6ddbcf348 Merge pull request #13 from Citadel-Station-13/master BlueWildrose 2021-01-01 21:07:57 -07:00
  • bf8c87f373 Update MetaStation.dmm TripleShades 2021-01-01 15:49:57 -08:00
  • c57a5520fa Update MetaStation.dmm TripleShades 2021-01-01 14:59:01 -08:00
  • dc44102d8b fix Timothy Teakettle 2021-01-01 22:39:16 +00:00
  • 974f46cb22 attempt to fix Timothy Teakettle 2021-01-01 22:36:35 +00:00
  • 813e0f4c79 Merge remote-tracking branch 'upstream/master' into unlockable-loadout-items Timothy Teakettle 2021-01-01 22:30:04 +00:00
  • 190fcb312b Update mobs.dm silicons 2021-01-01 12:24:46 -07:00
  • 6a247e2a68 Adds a new version of bokken, cleans up some unnecessary code, completely redoes several bokken related sprites necromanceranne 2021-01-02 04:26:39 +11:00
  • 336272fb02 Nevermind, I heard the catgirl wrong we're going back. Chiirno 2021-01-01 05:42:35 -04:00
  • 977f0c4cc9 how about this Chiirno 2021-01-01 05:39:23 -04:00
  • fd2bbe23e0 A catgirl on discord told be replacing the bundle file would be ok Chiirno 2021-01-01 05:33:34 -04:00
  • 368a8d5726 Automatic changelog generation for PR #13930 [ci skip] CitadelStationBot 2021-01-01 03:17:19 -06:00
  • 9cebd096eb Merge pull request #13930 from MrJWhit/fixing-up-sec-on-box silicons 2021-01-01 02:17:16 -07:00
  • 78322199e3 fix silicons 2021-01-01 00:38:46 -08:00
  • da5ea18c9a OK, compiling did something funky to the dm code? Chiirno 2021-01-01 04:04:39 -04:00
  • bbeed2b8f0 I've done it, I've edited TgUI! Chiirno 2021-01-01 04:00:35 -04:00
  • 7b9a2656ce Automatic changelog generation for PR #13924 [ci skip] CitadelStationBot 2021-01-01 01:15:55 -06:00
  • a2bb761bee Merge pull request #13924 from SandPoot/master DeltaFire 2021-01-01 08:15:53 +01:00
  • ee6601276d Merge pull request #13935 from Citadel-Station-13/silicons-patch-58 DeltaFire 2021-01-01 08:11:40 +01:00
  • 6b0435e7b5 Port. uomo91 2021-01-01 00:46:47 -06:00
  • 2ed866d855 boom DeltaFire 2021-01-01 07:22:10 +01:00
  • fbb2cfbba1 Update colormate.dm silicons 2020-12-31 23:05:14 -07:00
  • 66736cb9c2 Merge remote-tracking branch 'upstream/master' DeltaFire 2021-01-01 07:04:20 +01:00