Commit Graph

37550 Commits

Author SHA1 Message Date
silicons
033feebcd0 Merge pull request #12957 from kappa-sama/patch-34
removes malf disk from tendril loot
2020-08-29 21:31:24 -07:00
silicons
71072ebc5e Merge pull request #13260 from dapnee/deleting-time
[s] removes a certain donator item
2020-08-29 21:25:22 -07:00
CitadelStationBot
be82abd038 Automatic changelog generation for PR #13263 [ci skip] 2020-08-29 23:24:44 -05:00
silicons
50cf863501 Merge pull request #13263 from raspy-on-osu/tesla-groundingrodspull
Tesla Counterplay.
2020-08-29 21:24:41 -07:00
CitadelStationBot
d59c4c0c2b Automatic changelog generation for PR #13266 [ci skip] 2020-08-29 23:22:47 -05:00
silicons
4a3b6054d3 Merge pull request #13266 from Ghommie/Ghommie-cit836
Fixing some mistakes with the priority overlays removal PR.
2020-08-29 21:22:44 -07:00
CitadelStationBot
3db85a901a Automatic changelog generation for PR #13267 [ci skip] 2020-08-29 23:22:30 -05:00
silicons
8cc84152d8 Merge pull request #13267 from Arturlang/op_slimes
Lets slime damage structures
2020-08-29 21:22:27 -07:00
CitadelStationBot
8bd84f894c Automatic changelog generation for PR #13268 [ci skip] 2020-08-29 23:22:14 -05:00
silicons
84734591ed Merge pull request #13268 from timothyteakettle/accents
separates tongues speech handling into accent datums
2020-08-29 21:22:11 -07:00
CitadelStationBot
6c86524bf6 Automatic changelog generation for PR #13269 [ci skip] 2020-08-29 23:21:38 -05:00
silicons
1e83a30f9e Merge pull request #13269 from EmeraldSundisk/poolmeta
Adds a pool to MetaStation(?).
2020-08-29 21:21:35 -07:00
CitadelStationBot
cd01dd5e61 Automatic changelog generation for PR #13272 [ci skip] 2020-08-29 23:21:26 -05:00
silicons
78b8072d13 Merge pull request #13272 from Detective-Google/patch-1
plasmamen are playable now
2020-08-29 21:21:23 -07:00
CitadelStationBot
342d368da3 Automatic changelog generation for PR #13276 [ci skip] 2020-08-29 23:21:04 -05:00
silicons
7ad037ee53 Merge pull request #13276 from timothyteakettle/emotes
every emote is unrestricted
2020-08-29 21:21:01 -07:00
CitadelStationBot
d8e0f9df1a Automatic changelog generation for PR #13277 [ci skip] 2020-08-29 23:19:50 -05:00
silicons
e677804bd7 Merge pull request #13277 from Chiirno/AnaPanRework
Reworks Anatomic Panacea
2020-08-29 21:19:47 -07:00
CitadelStationBot
531cbbcc61 Automatic changelog generation for PR #13280 [ci skip] 2020-08-29 23:19:20 -05:00
silicons
e16abbc945 Merge pull request #13280 from raspy-on-osu/teg-castration-2
Further tweaks the TEG's power output
2020-08-29 21:19:18 -07:00
CitadelStationBot
84437788e6 Automatic changelog generation for PR #13281 [ci skip] 2020-08-29 23:19:06 -05:00
silicons
5f7d80eab2 Merge pull request #13281 from Putnam3145/examine-pref
Added genital/vore examine text prefs
2020-08-29 21:19:03 -07:00
silicons
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
silicons
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
silicons
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
silicons
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
silicons
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
silicons
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
raspy-on-osu
d116dd49b2 teg tweak 2020-08-27 23:04:00 -04:00
Changelogs
9799efcef2 Automatic changelog compile [ci skip] 2020-08-28 00:13:53 +00:00
Timothy Teakettle
b3c459c59c okay you can use any emote 2020-08-27 21:04:36 +01:00
Timothy Teakettle
398692df0b emotes 2020-08-27 20:24:37 +01:00
Lynxless
4caeb310f7 Added blank line to the end of files 2020-08-27 15:59:07 -03:00