shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Commit Graph

  • bdab7c2f4b Update species.dm silicons 2021-01-19 03:30:18 -07:00
  • 741fd455ec Fixes deleted hypereutatic blade sprites necromanceranne 2021-01-19 19:46:11 +11:00
  • e6e9a22615 Automatic changelog generation for PR #14082 [ci skip] CitadelStationBot 2021-01-18 22:19:19 -06:00
  • 16e2470e6b Merge pull request #14082 from kappa-sama/patch-45 Lin 2021-01-18 22:19:15 -06:00
  • 1fa2b7b331 Merge pull request #14084 from Citadel-Station-13/silicons-patch-23 Lin 2021-01-18 20:39:57 -06:00
  • b46caa77af Gives /datum/reagent/consumable/ethanol/species_drink a name kittycat2002 2021-01-18 21:39:34 -05:00
  • 837e766306 fixes sanitization timothyteakettle 2021-01-19 01:04:01 +00:00
  • 450937a8f3 Update lavaland_surface_alien_nest.dmm shellspeed1 2021-01-18 15:27:40 -08:00
  • b956df2226 name description implement Timothy Teakettle 2021-01-18 21:59:00 +00:00
  • 88c21942d0 Merge branch 'master' into Timidwomen Blue Wildrose 2021-01-18 14:42:52 -07:00
  • fd69938884 Tired of these motherfucking merge conflicts on this motherfucking PR Blue Wildrose 2021-01-18 14:31:40 -07:00
  • 381f27c5b1 will this work? Blue Wildrose 2021-01-18 14:28:16 -07:00
  • 5173a7f790 *SCREAM Blue Wildrose 2021-01-18 14:25:44 -07:00
  • b2f036de6b Fuck merge conflicts icons are fucking annoying Blue Wildrose 2021-01-18 14:22:27 -07:00
  • 0c139970c8 merge conflict resolution attempt Blue Wildrose 2021-01-18 14:16:45 -07:00
  • a49f98aac8 attempting to resolve merge conflict Blue Wildrose 2021-01-18 14:12:30 -07:00
  • d9abb36096 Merge pull request #17 from Citadel-Station-13/master BlueWildrose 2021-01-18 14:06:40 -07:00
  • c79177ab07 Adds Timid wo/man outfits Blue Wildrose 2021-01-18 13:42:38 -07:00
  • eb20501cc0 oops missed this light switch from earlier box surgery pr TripleShades 2021-01-18 11:50:41 -08:00
  • 58dde0f60e Merge pull request #14045 from Citadel-Station-13/silicons-patch-9 Lin 2021-01-18 13:22:51 -06:00
  • 5eafdd164f Merge pull request #14069 from Citadel-Station-13/silicons-patch-18 Lin 2021-01-18 13:21:13 -06:00
  • 73213b4bad Merge pull request #14079 from LetterN/patch-3 Lin 2021-01-18 13:17:05 -06:00
  • 61d4f2cdad Merge pull request #14080 from Citadel-Station-13/silicons-patch-21 Lin 2021-01-18 13:13:00 -06:00
  • 51fc5ae235 Merge pull request #14053 from Citadel-Station-13/silicons-patch-13 Putnam3145 2021-01-18 10:17:56 -08:00
  • db66e6634b Merge pull request #14091 from Citadel-Station-13/silicons-patch-26 Putnam3145 2021-01-18 10:16:19 -08:00
  • 0229078b58 Update foam_dart.dm silicons 2021-01-18 02:32:21 -07:00
  • 4f49dab040 Update Mining_Station_Public_01.dmm MrJWhit 2021-01-18 01:57:05 -05:00
  • bbd3fd54ba fixed map alteration I think shellspeed1 2021-01-17 19:44:18 -08:00
  • 7ad42c9d53 Automatic changelog generation for PR #13963 [ci skip] CitadelStationBot 2021-01-17 21:43:27 -06:00
  • 4099e57f4e Merge pull request #13963 from necromanceranne/robocoat silicons 2021-01-17 20:43:24 -07:00
  • 6dd48ba515 Automatic changelog generation for PR #14037 [ci skip] CitadelStationBot 2021-01-17 21:42:23 -06:00
  • 2266a9e17b Merge pull request #14037 from DeltaFire15/nanogel silicons 2021-01-17 20:42:19 -07:00
  • 0db94c5aa8 Update code/modules/reagents/chemistry/reagents/toxin_reagents.dm silicons 2021-01-17 20:41:48 -07:00
  • 233bdebd53 Automatic changelog generation for PR #14030 [ci skip] CitadelStationBot 2021-01-17 21:41:32 -06:00
  • 8d023b26b4 Merge pull request #14030 from Putnam3145/usual-judgment silicons 2021-01-17 20:41:29 -07:00
  • 885ac35b32 Automatic changelog generation for PR #14029 [ci skip] CitadelStationBot 2021-01-17 21:41:23 -06:00
  • af524f4a07 Merge pull request #14029 from HeroWithYay/Sci_Guns_Fix silicons 2021-01-17 20:41:20 -07:00
  • 988b2f6519 Automatic changelog generation for PR #14055 [ci skip] CitadelStationBot 2021-01-17 21:41:09 -06:00
  • 765a4b94b3 Merge pull request #14055 from BlueWildrose/BeFreeMyWeenie silicons 2021-01-17 20:41:06 -07:00
  • 0cc0f6def3 Automatic changelog generation for PR #14043 [ci skip] CitadelStationBot 2021-01-17 21:40:50 -06:00
  • e336d26a33 Merge pull request #14043 from timothyteakettle/pie-lick silicons 2021-01-17 20:40:47 -07:00
  • cbfafa6730 Automatic changelog generation for PR #14065 [ci skip] CitadelStationBot 2021-01-17 21:40:35 -06:00
  • a59256279e Automatic changelog generation for PR #14070 [ci skip] CitadelStationBot 2021-01-17 21:40:34 -06:00
  • f6fd5f3076 Merge pull request #14065 from MrJWhit/pubbystation-fixes silicons 2021-01-17 20:40:29 -07:00
  • c0edfa729b Merge pull request #14070 from YakumoChen/distressingly-fuzzy silicons 2021-01-17 20:40:22 -07:00
  • 18ba0d0150 Automatic changelog generation for PR #14061 [ci skip] CitadelStationBot 2021-01-17 21:40:12 -06:00
  • 829e946755 Merge pull request #14061 from Hatterhat/gauze-parity silicons 2021-01-17 20:40:09 -07:00
  • db1693b906 Update colormate.dm silicons 2021-01-17 20:39:00 -07:00
  • ffa56152d4 Update colormate.dm silicons 2021-01-17 20:36:19 -07:00
  • 1aae6a2154 Update colormate.dm silicons 2021-01-17 20:35:08 -07:00
  • 9e52451df8 Update colormate.dm silicons 2021-01-17 20:26:52 -07:00
  • 6146a4ca9a Update mob_holder.dm silicons 2021-01-17 20:24:53 -07:00
  • 444ba0ed0d Update pool_main.dm silicons 2021-01-17 20:01:07 -07:00
  • eabecb1618 Revert "Reworks lavaland xeno ruin a bit" shellspeed1 2021-01-17 18:07:48 -08:00
  • e8e92cb805 Reworks lavaland xeno ruin a bit shellspeed1 2021-01-17 18:01:38 -08:00
  • c89341227c Adds more dead xeno subtypes for mapping shellspeed1 2021-01-17 18:01:24 -08:00
  • 07b10f268b Merge pull request #14072 from Citadel-Station-13/silicons-patch-20 Lin 2021-01-17 19:04:22 -06:00
  • aa6687646d s kappa-sama 2021-01-17 19:50:44 -05:00
  • 760ac29c1d Fixes merge conflict Fermi 2021-01-17 22:22:41 +00:00
  • 085540af3c Update negative.dm silicons 2021-01-17 15:21:31 -07:00
  • 3d8bae8cef Update _quirk.dm silicons 2021-01-17 15:20:37 -07:00
  • cb614bcd95 Merge branch 'master' into Dispencer-UI-change Fermi 2021-01-17 22:19:45 +00:00
  • 2fcaa637f5 Merge remote-tracking branch 'upstream/master' Fermi 2021-01-17 22:19:12 +00:00
  • e58b7f2f31 Merge pull request #40 from Thalpy/tgs-dmapi-update Thalpy 2021-01-17 22:18:09 +00:00
  • 30b1cd82f9 . silicons 2021-01-17 12:02:12 -07:00
  • a917034542 Update toggles.dm silicons 2021-01-17 03:46:20 -07:00
  • 45a2076771 Update toggles.dm silicons 2021-01-17 03:35:49 -07:00
  • 0b088be4df missing , Letter N 2021-01-17 18:00:43 +08:00
  • 919b8c8d57 Update machine_circuitboards.dm Letter N 2021-01-17 17:54:06 +08:00
  • 7afe6d617f Update kinkmate.dm Letter N 2021-01-17 17:50:14 +08:00
  • 0c45aab261 Update MetaStation.dmm MrJWhit 2021-01-17 04:45:55 -05:00
  • 5f5c7667df Update MetaStation.dmm MrJWhit 2021-01-17 03:48:41 -05:00
  • 6e18f10ead forgot i wasnt usin that oops Hatterhat 2021-01-17 01:50:28 -06:00
  • cb1ef2d8ba cotton stack pull Hatterhat 2021-01-17 01:42:32 -06:00
  • b6cdde2f52 squeak fix silicons 2021-01-16 06:12:34 -07:00
  • e96fec682e fix silicons 2021-01-16 04:59:07 -07:00
  • 5f117a0331 Update basilisk.dm silicons 2021-01-16 03:15:49 -07:00
  • 693887487b I saw what had been wrought, and trembled YakumoChen 2021-01-16 08:29:14 +00:00
  • fba17abaf4 god damn it Trilby YakumoChen 2021-01-16 08:23:08 +00:00
  • 6a983ff8a7 help YakumoChen 2021-01-16 03:20:41 -05:00
  • 98bc547c5b Update say.dm silicons 2021-01-16 01:07:52 -07:00
  • 1c9c0b7745 Update BoxStation.dmm TripleShades 2021-01-15 17:42:36 -08:00
  • 36e82c59d6 Update BoxStation.dmm TripleShades 2021-01-15 17:30:10 -08:00
  • 1f1605bbb6 Update BoxStation.dmm TripleShades 2021-01-15 16:54:24 -08:00
  • 5b5bc85b8f Fixes conflicts AGAIN necromanceranne 2021-01-16 04:58:47 +11:00
  • 6ac010e442 Merge branch 'master' into robocoat necromanceranne 2021-01-16 04:56:03 +11:00
  • 668da87dca Automatic changelog generation for PR #14040 [ci skip] CitadelStationBot 2021-01-15 11:52:12 -06:00
  • 7bdfa34321 Merge pull request #14040 from LetterN/fix-tgui DeltaFire 2021-01-15 18:52:08 +01:00
  • 8333d6309c Automatic changelog generation for PR #14044 [ci skip] CitadelStationBot 2021-01-15 11:50:16 -06:00
  • 3e917653c7 Merge pull request #14044 from corin9090/beadies DeltaFire 2021-01-15 18:50:14 +01:00
  • d331dd4b1e Merge pull request #14046 from Citadel-Station-13/silicons-patch-10 DeltaFire 2021-01-15 18:30:32 +01:00
  • de40e96180 Merge pull request #14047 from Citadel-Station-13/silicons-patch-11 DeltaFire 2021-01-15 18:30:16 +01:00
  • 26a38f1868 Automatic changelog generation for PR #14048 [ci skip] CitadelStationBot 2021-01-15 11:24:21 -06:00
  • a0e6b45111 Merge pull request #14048 from MrJWhit/hey-this-tip-of-the-round-is-wrong DeltaFire 2021-01-15 18:24:17 +01:00
  • 3f170845e4 Automatic changelog generation for PR #14054 [ci skip] CitadelStationBot 2021-01-15 11:22:08 -06:00
  • aa1cae9f33 Merge pull request #14054 from TheObserver-sys/AReturnToForm DeltaFire 2021-01-15 18:22:05 +01:00
  • f1d254f4e5 Merge pull request #14057 from Citadel-Station-13/silicons-patch-15 DeltaFire 2021-01-15 18:15:56 +01:00
  • 9cba09dae8 Automatic changelog generation for PR #14060 [ci skip] CitadelStationBot 2021-01-15 11:14:46 -06:00
  • 771a4f3c41 Merge pull request #14060 from Hatterhat/shrink-removal DeltaFire 2021-01-15 18:14:42 +01:00
  • bae7d37a89 Merge pull request #14064 from Citadel-Station-13/silicons-patch-16 DeltaFire 2021-01-15 18:13:08 +01:00