Commit Graph
38477 Commits
Author SHA1 Message Date
Maxim NikitinandGitHub 96d46ca0e4 Makes the slimeperson swap-body UI stay open when you switch bodies 2020-10-02 12:03:24 -04:00
Changelogs 824cb8c118 Automatic changelog compile [ci skip] 2020-10-02 00:14:43 +00:00
CitadelStationBot 55bb79cb68 Automatic changelog generation for PR #12439 [ci skip] 2020-10-01 16:15:08 -05:00
siliconsandGitHub f6dccd5ac5 Merge pull request #12439 from timothyteakettle/cool-ipcs
makes ipcs more like robots (a partial port from skyrat)
2020-10-01 14:15:04 -07:00
Timothy TeakettleandGitHub 710ab0ffa6 Update eyes.dm 2020-10-01 22:06:03 +01:00
CitadelStationBot f827ed9442 Automatic changelog generation for PR #13475 [ci skip] 2020-10-01 16:04:56 -05:00
siliconsandGitHub 7e7fd351c1 Merge pull request #13475 from Detective-Google/clothing
Ports a few RP clothings and adds the detective clothing vendor
2020-10-01 14:04:52 -07:00
CitadelStationBot e1c92ca2be Automatic changelog generation for PR #13471 [ci skip] 2020-10-01 16:03:47 -05:00
siliconsandGitHub 201134d15c Merge pull request #13471 from zeroisthebiggay/patch-2
adds "clicks" as a speech verb in the character creator
2020-10-01 14:03:44 -07:00
Timothy TeakettleandGitHub cd81cd4402 why 2020-10-01 21:19:40 +01:00
Timothy TeakettleandGitHub 7b4c7d936a fuckfuckfuck 2020-10-01 21:09:24 +01:00
Timothy TeakettleandGitHub 7726b0456c Merge branch 'master' into cool-ipcs 2020-10-01 21:06:16 +01:00
Timothy Teakettle 14e217082f compile 2020-10-01 20:51:53 +01:00
CitadelStationBot 79b7ef0e62 Automatic changelog generation for PR #13314 [ci skip] 2020-10-01 14:15:53 -05:00
siliconsandGitHub 1f82e8985c Merge pull request #13314 from TheObserver-sys/ArcaneNutriMutaPort
No more chemspam: Ports portions of ArcaneMusic's botany rework from TG.
2020-10-01 12:15:49 -07:00
Detective Google 57132d0b32 Merge remote-tracking branch 'upstream/master' into clothing 2020-10-01 14:06:21 -05:00
CitadelStationBot ef311cd1ec Automatic changelog generation for PR #13486 [ci skip] 2020-10-01 13:13:52 -05:00
siliconsandGitHub d83c8a5f77 Merge pull request #13486 from CoreFlare/goodcloaks
Altcloaks from the Frontier
2020-10-01 11:13:49 -07:00
CoreFlare 9d76f6af80 good cloaks
i like gooder cloaks
2020-10-01 15:08:39 +01:00
The0bserver 9e702c2ede No more self sufficiency. 2020-10-01 06:49:54 -04:00
The0bserver e0089ea813 Again? 2020-10-01 06:44:11 -04:00
The0bserver 1ccf5efcab Merge remote-tracking branch 'origin/ArcaneNutriMutaPort' into BotanyChembutnotspammy 2020-10-01 06:40:27 -04:00
The0bserver 7c695409d0 Okay, we went back in time. Maybe this will work? 2020-10-01 06:40:09 -04:00
CitadelStationBot f52e136faa Automatic changelog generation for PR #13477 [ci skip] 2020-10-01 05:13:55 -05:00
siliconsandGitHub c8d6f3d22a Merge pull request #13477 from LetterN/patch-2
Adds craftable railings
2020-10-01 03:13:51 -07:00
CitadelStationBot c4dfbeec25 Automatic changelog generation for PR #13452 [ci skip] 2020-10-01 05:13:19 -05:00
siliconsandGitHub d8e58b1c48 Merge pull request #13452 from Tupinambis/CarbonHydrogenBromine
Ascent Port Project: Methane and Methyl Bromide Gas Additions
2020-10-01 03:13:15 -07:00
CitadelStationBot 0ecbf7ee87 Automatic changelog generation for PR #13441 [ci skip] 2020-10-01 05:11:26 -05:00
siliconsandGitHub 3149732bbb Merge pull request #13441 from Putnam3145/shiver-fever-patch
Makes fever use the proper thresholds and shivering have thresholds at all.
2020-10-01 03:11:23 -07:00
CitadelStationBot 704e02d7f1 Automatic changelog generation for PR #13423 [ci skip] 2020-10-01 05:11:07 -05:00
siliconsandGitHub 71de73e16b Merge pull request #13423 from MrJWhit/drone-e-button
Gives drones back their e button (port)
2020-10-01 03:11:04 -07:00
CitadelStationBot 9a8449dbf2 Automatic changelog generation for PR #13467 [ci skip] 2020-10-01 05:10:07 -05:00
siliconsandGitHub fba8bfbf4f Merge pull request #13467 from Putnam3145/past-me-idiot
Fixes vore prefs (I was looking in the wrong place the whole time)
2020-10-01 03:10:04 -07:00
CitadelStationBot 2cd035038e Automatic changelog generation for PR #13470 [ci skip] 2020-10-01 05:09:54 -05:00
siliconsandGitHub 4dd9f20d22 Merge pull request #13470 from EmeraldSundisk/skelter
Helter-Skelter.
2020-10-01 03:09:51 -07:00
siliconsandGitHub 1f4e3b9a92 Merge branch 'master' into patch-2 2020-10-01 03:09:38 -07:00
CitadelStationBot edb180fdb8 Automatic changelog generation for PR #13466 [ci skip] 2020-10-01 05:07:12 -05:00
siliconsandGitHub 38c25bdc9d Merge pull request #13466 from Putnam3145/sdgf-fix
Cleans up and fixes SDGF code a bit, consistent naked clones, transfer_ckey resets view range
2020-10-01 03:07:08 -07:00
CitadelStationBot 7957d69297 Automatic changelog generation for PR #13463 [ci skip] 2020-10-01 05:06:44 -05:00
siliconsandGitHub bb09acff4c Merge pull request #13463 from timothyteakettle/slime-sprites
adds luminescent and stargazer sprites as selectable body sprites for slimes
2020-10-01 03:06:41 -07:00
CitadelStationBot 6684d1d9d7 Automatic changelog generation for PR #13458 [ci skip] 2020-10-01 05:06:22 -05:00
siliconsandGitHub f8bd6d3f49 Merge pull request #13458 from lolman360/plumbingfix3
smoke machine/autoharvest hydro tray fix
2020-10-01 03:06:19 -07:00
CitadelStationBot f6d5aa15f7 Automatic changelog generation for PR #13455 [ci skip] 2020-10-01 05:06:06 -05:00
siliconsandGitHub 7553508a2a Merge pull request #13455 from Putnam3145/pyroclastic-policy
Added policy config for sentient pyro slimes (no actual policy yet)
2020-10-01 03:06:03 -07:00
CitadelStationBot 836a8c8b54 Automatic changelog generation for PR #13450 [ci skip] 2020-10-01 05:05:40 -05:00
siliconsandGitHub bbb7ff347d Merge pull request #13450 from MrJWhit/new-swat-sprites
Plz work, new heavy suits
2020-10-01 03:05:35 -07:00
CitadelStationBot 8c1210492b Automatic changelog generation for PR #13446 [ci skip] 2020-10-01 05:05:19 -05:00
siliconsandGitHub a9ad06c107 Merge pull request #13446 from Putnam3145/dynamic-why-prob
Makes dynamic less probabilistic, keeping the desired threat level more aggressively
2020-10-01 03:05:15 -07:00
CitadelStationBot d52e4782ed Automatic changelog generation for PR #13443 [ci skip] 2020-10-01 05:04:24 -05:00
siliconsandGitHub 47aef0d574 Merge pull request #13443 from ItzGabby/gabby-wooden-floors
Gabbys new wooden floor tile types
2020-10-01 03:04:21 -07:00