Commit Graph

40751 Commits

Author SHA1 Message Date
Letter N 2e2a609d4b Merge remote-tracking branch 'origin/master' into semi-sync 2021-01-20 10:24:28 +08:00
Letter N c08765d0eb let's not get ddosed 2021-01-20 10:23:30 +08:00
CitadelStationBot 131b11f4ae Automatic changelog generation for PR #13826 [ci skip] 2021-01-19 19:22:11 -06:00
Putnam3145 f7f9185073 Merge pull request #13826 from LetterN/semi-sync
/tg/ ""hardsync"" part one of many*
2021-01-19 17:22:05 -08:00
CitadelStationBot b1fb0b3095 Automatic changelog generation for PR #14089 [ci skip] 2021-01-19 12:46:17 -06:00
Lin 11ab32d8d6 Merge pull request #14089 from MrJWhit/mining-station-minor-QoL
Minor minning station QoL
2021-01-19 12:46:13 -06:00
silicons dedb0cb62e Merge remote-tracking branch 'citadel/master' into tgsync 2021-01-19 04:24:42 -07:00
silicons f0a9a7a179 fix 2021-01-19 04:21:21 -07:00
CitadelStationBot e6e9a22615 Automatic changelog generation for PR #14082 [ci skip] 2021-01-18 22:19:19 -06:00
Lin 16e2470e6b Merge pull request #14082 from kappa-sama/patch-45
s
2021-01-18 22:19:15 -06:00
Lin 1fa2b7b331 Merge pull request #14084 from Citadel-Station-13/silicons-patch-23
robots don't get tired from swimming
2021-01-18 20:39:57 -06:00
Lin 58dde0f60e Merge pull request #14045 from Citadel-Station-13/silicons-patch-9
gorilla pais
2021-01-18 13:22:51 -06:00
Lin 5eafdd164f Merge pull request #14069 from Citadel-Station-13/silicons-patch-18
moves say_emphasis from compose_message to lang_treat to prevent _underlines_ from colliding with command_headset spans having _ in it
2021-01-18 13:21:13 -06:00
Lin 73213b4bad Merge pull request #14079 from LetterN/patch-3
Fixes this vending oversight
2021-01-18 13:17:05 -06:00
Lin 61d4f2cdad Merge pull request #14080 from Citadel-Station-13/silicons-patch-21
hooded suits now sync colors to their hood on extend
2021-01-18 13:13:00 -06:00
Putnam3145 51fc5ae235 Merge pull request #14053 from Citadel-Station-13/silicons-patch-13
"Make it so you can squeeze someone's hand when you hold it"
2021-01-18 10:17:56 -08:00
Putnam3145 db66e6634b Merge pull request #14091 from Citadel-Station-13/silicons-patch-26
[s] UM
2021-01-18 10:16:19 -08:00
silicons 0229078b58 Update foam_dart.dm 2021-01-18 02:32:21 -07:00
MrJWhit 4f49dab040 Update Mining_Station_Public_01.dmm 2021-01-18 01:57:05 -05:00
CitadelStationBot 7ad42c9d53 Automatic changelog generation for PR #13963 [ci skip] 2021-01-17 21:43:27 -06:00
silicons 4099e57f4e Merge pull request #13963 from necromanceranne/robocoat
Mostly ports tgstation #54644; New roboticist labcoat sprites
2021-01-17 20:43:24 -07:00
CitadelStationBot 6dd48ba515 Automatic changelog generation for PR #14037 [ci skip] 2021-01-17 21:42:23 -06:00
silicons 2266a9e17b Merge pull request #14037 from DeltaFire15/nanogel
Nanogel for robotic limbs
2021-01-17 20:42:19 -07:00
CitadelStationBot 233bdebd53 Automatic changelog generation for PR #14030 [ci skip] 2021-01-17 21:41:32 -06:00
silicons 8d023b26b4 Merge pull request #14030 from Putnam3145/usual-judgment
Replaces majority judgment with usual judgement
2021-01-17 20:41:29 -07:00
CitadelStationBot 885ac35b32 Automatic changelog generation for PR #14029 [ci skip] 2021-01-17 21:41:23 -06:00
silicons af524f4a07 Merge pull request #14029 from HeroWithYay/Sci_Guns_Fix
Ports TG code for wormhole projector and gravity gun.
2021-01-17 20:41:20 -07:00
CitadelStationBot 988b2f6519 Automatic changelog generation for PR #14055 [ci skip] 2021-01-17 21:41:09 -06:00
silicons 765a4b94b3 Merge pull request #14055 from BlueWildrose/BeFreeMyWeenie
Purges the cock and titty straining when both genitals are growing
2021-01-17 20:41:06 -07:00
CitadelStationBot 0cc0f6def3 Automatic changelog generation for PR #14043 [ci skip] 2021-01-17 21:40:50 -06:00
silicons e336d26a33 Merge pull request #14043 from timothyteakettle/pie-lick
licking people washes pie off their face
2021-01-17 20:40:47 -07:00
CitadelStationBot cbfafa6730 Automatic changelog generation for PR #14065 [ci skip] 2021-01-17 21:40:35 -06:00
CitadelStationBot a59256279e Automatic changelog generation for PR #14070 [ci skip] 2021-01-17 21:40:34 -06:00
silicons f6fd5f3076 Merge pull request #14065 from MrJWhit/pubbystation-fixes
Random pubbystation fixes
2021-01-17 20:40:29 -07:00
silicons c0edfa729b Merge pull request #14070 from YakumoChen/distressingly-fuzzy
Makes Buzz Fuzz go on a diet
2021-01-17 20:40:22 -07:00
CitadelStationBot 18ba0d0150 Automatic changelog generation for PR #14061 [ci skip] 2021-01-17 21:40:12 -06:00
silicons 829e946755 Merge pull request #14061 from Hatterhat/gauze-parity
something something gauze things
2021-01-17 20:40:09 -07:00
silicons 444ba0ed0d Update pool_main.dm 2021-01-17 20:01:07 -07:00
Lin 07b10f268b Merge pull request #14072 from Citadel-Station-13/silicons-patch-20
small optimization to watchers being rather aptly named and laggier than a goddamn chunkloader
2021-01-17 19:04:22 -06:00
kappa-sama aa6687646d s
s
2021-01-17 19:50:44 -05:00
silicons 30b1cd82f9 . 2021-01-17 12:02:12 -07:00
silicons a917034542 Update toggles.dm 2021-01-17 03:46:20 -07:00
silicons 45a2076771 Update toggles.dm 2021-01-17 03:35:49 -07:00
Letter N 0b088be4df missing , 2021-01-17 18:00:43 +08:00
Letter N 919b8c8d57 Update machine_circuitboards.dm 2021-01-17 17:54:06 +08:00
Letter N 7afe6d617f Update kinkmate.dm 2021-01-17 17:50:14 +08:00
silicons b6cdde2f52 squeak fix 2021-01-16 06:12:34 -07:00
silicons e96fec682e fix 2021-01-16 04:59:07 -07:00
silicons 5f117a0331 Update basilisk.dm 2021-01-16 03:15:49 -07:00
YakumoChen 693887487b I saw what had been wrought, and trembled 2021-01-16 08:29:14 +00:00