Commit Graph
37495 Commits
Author SHA1 Message Date
siliconsandGitHub 5f7d80eab2 Merge pull request #13281 from Putnam3145/examine-pref
Added genital/vore examine text prefs
2020-08-29 21:19:03 -07:00
siliconsandGitHub af74553885 Merge pull request #13283 from SweptWasTaken/cratetweaks
Modifies some crate sprites.
2020-08-29 21:18:51 -07:00
CitadelStationBot 48be8aea9d Automatic changelog generation for PR #13290 [ci skip] 2020-08-29 23:17:29 -05:00
siliconsandGitHub ad1ab7c7c4 Merge pull request #13290 from ForrestWick/funnynoclip
Nukies can't get wall-boots anymore
2020-08-29 21:17:26 -07:00
CitadelStationBot 1536ff18f1 Automatic changelog generation for PR #13125 [ci skip] 2020-08-29 23:16:19 -05:00
siliconsandGitHub 5a06d82b93 Merge pull request #13125 from Chiirno/CogDice-Hotfix
Moved dice from pill_bottles to boxes on cogStation
2020-08-29 21:16:16 -07:00
CitadelStationBot 1397c1e3e1 Automatic changelog generation for PR #13184 [ci skip] 2020-08-29 23:16:07 -05:00
siliconsandGitHub 67e946d312 Merge pull request #13184 from timothyteakettle/two-joke-sprites
removes two unused sprites
2020-08-29 21:16:04 -07:00
CitadelStationBot de013d6ecd Automatic changelog generation for PR #13173 [ci skip] 2020-08-29 23:13:30 -05:00
siliconsandGitHub d6fa140014 Merge pull request #13173 from LetterN/TGUI-CHAT-TGUI-CHAT-TGUI-CHAT
ports tgchat and tgui 4.1
2020-08-29 21:13:26 -07:00
Letter N 8175486453 webstorage moment 2020-08-30 09:39:07 +08:00
Changelogs 23c56a073f Automatic changelog compile [ci skip] 2020-08-30 00:12:08 +00:00
Letter N fe17bee28e reverts thing kev said about 2020-08-29 14:36:41 +08:00
Letter N ae482c1bb8 Merge remote-tracking branch 'origin/master' into TGUI-CHAT-TGUI-CHAT-TGUI-CHAT 2020-08-29 14:09:56 +08:00
Letter N 116145872f commit thing, need to see changies but gitlens is denying me 2020-08-29 14:00:46 +08:00
CitadelStationBot 98c26bca04 Automatic changelog generation for PR #13282 [ci skip] 2020-08-29 00:34:44 -05:00
siliconsandGitHub 5e488dda3f Merge pull request #13282 from raspy-on-osu/port-skyrat13-3295
Port "Better Explosion Echoes" by NotRanged
2020-08-28 22:34:41 -07:00
ForrestWick 84ed82c9e7 whyseris 2020-08-28 22:09:30 -04:00
Changelogs 785a99cfd1 Automatic changelog compile [ci skip] 2020-08-29 00:13:09 +00:00
raspy-on-osu 4f2f6b537e credit's already given in the pr let's not 2020-08-28 13:44:41 -04:00
Swept 635ee0cbbb Initial 2020-08-28 00:45:05 -07:00
raspy-on-osu 96d006f551 oops 2020-08-27 23:48:19 -04:00
raspy-on-osu ca34a50726 Port "Better Explosion Echoes" by NotRanged https://github.com/Skyrat-SS13/Skyrat13/pull/3295 2020-08-27 23:39:43 -04:00
Putnam c7883775fa Added a pref to see genitals on examine. 2020-08-27 20:22:24 -07:00
Changelogs 9799efcef2 Automatic changelog compile [ci skip] 2020-08-28 00:13:53 +00:00
CitadelStationBot 68020ec842 Automatic changelog generation for PR #13235 [ci skip] 2020-08-27 12:07:34 -05:00
siliconsandGitHub 664b2490c3 Merge pull request #13235 from timothyteakettle/bokken-update
buffs bokkens stamina damage by 2
2020-08-27 10:07:31 -07:00
CitadelStationBot 40eb26a71b Automatic changelog generation for PR #13237 [ci skip] 2020-08-27 12:07:08 -05:00
siliconsandGitHub b162d8184d Merge pull request #13237 from Hatterhat/pda-bomb-limited
pda bomb buyonce
2020-08-27 10:07:05 -07:00
CitadelStationBot 0e70b4ee4d Automatic changelog generation for PR #13256 [ci skip] 2020-08-27 12:03:37 -05:00
siliconsandGitHub 2bc92145df Merge pull request #13256 from EmeraldSundisk/coglox
Expands CogStation's airlocks, among other things.
2020-08-27 10:03:33 -07:00
CitadelStationBot d396821659 Automatic changelog generation for PR #13257 [ci skip] 2020-08-27 12:03:18 -05:00
siliconsandGitHub 734ed238b7 Merge pull request #13257 from timothyteakettle/so-ya-like-qol-huh
qol: customization features appear in alphabetical order
2020-08-27 10:03:15 -07:00
CitadelStationBot afcb9d3432 Automatic changelog generation for PR #13258 [ci skip] 2020-08-27 12:02:46 -05:00
siliconsandGitHub 9440a92c09 Merge pull request #13258 from shellspeed1/iv-drips
Ports drip feeding mode for iv drips from tg.
2020-08-27 10:02:43 -07:00
CitadelStationBot 6bf02c7ed7 Automatic changelog generation for PR #13261 [ci skip] 2020-08-27 12:01:33 -05:00
siliconsandGitHub 91ad305282 Merge pull request #13261 from lolman360/Brain
adds a new brain damage line
2020-08-27 10:01:29 -07:00
CitadelStationBot e3bd5ea51d Automatic changelog generation for PR #13232 [ci skip] 2020-08-27 11:55:30 -05:00
siliconsandGitHub 857c581931 Merge pull request #13232 from timothyteakettle/is-this-a-good-idea
adds the ability to pick body sprites (you can choose aquatic/avian sprites as anthromorphs!)
2020-08-27 09:55:26 -07:00
CitadelStationBot 2a15e64be3 Automatic changelog generation for PR #13265 [ci skip] 2020-08-27 11:42:11 -05:00
siliconsandGitHub ec9b82381b Merge pull request #13265 from timothyteakettle/rock-paper-scissors
adds rock paper scissors
2020-08-27 09:42:08 -07:00
Changelogs 020b8f64ee Automatic changelog compile [ci skip] 2020-08-27 00:12:55 +00:00
timothyteakettle 97564312e3 mindreaders know your move 2020-08-26 17:06:58 +01:00
CitadelStationBot 7a7a773751 Automatic changelog generation for PR #13254 [ci skip] 2020-08-26 11:00:31 -05:00
siliconsandGitHub c264d90140 Update eyes.dm (#13254) 2020-08-26 18:00:27 +02:00
CitadelStationBot 6abd541d89 Automatic changelog generation for PR #13116 [ci skip] 2020-08-26 10:19:32 -05:00
siliconsandGitHub ff6beea525 rebalances shotgun shell stripper clips since no one else wants to (#13116)
* Update volumetrics.dm

* Update ammo_boxes.dm
2020-08-26 17:19:29 +02:00
siliconsandGitHub 1b30adbf2a Update robot.dm (#13247) 2020-08-26 14:14:33 +02:00
CitadelStationBot c6e1afc09e Automatic changelog generation for PR #13250 [ci skip] 2020-08-26 07:14:22 -05:00
Timothy TeakettleandGitHub d877a8c0fb qol (#13250) 2020-08-26 14:14:19 +02:00