Commit Graph

37597 Commits

Author SHA1 Message Date
Putnam
e97ef2d84d Added a character saving unit test. 2020-08-29 22:58:04 -07:00
CitadelStationBot
55226048b2 Automatic changelog generation for PR #13292 [ci skip] 2020-08-29 23:41:09 -05:00
silicons
bf27de1aec Merge pull request #13292 from Putnam3145/fix-dynamic-again
Rolling dynamic tweaks 'til it works
2020-08-29 21:41:06 -07:00
CitadelStationBot
328d1f255c Automatic changelog generation for PR #13293 [ci skip] 2020-08-29 23:40:50 -05:00
silicons
ded821f249 Merge pull request #13293 from lolman360/ShuttleEngineFixes
fixes custom shuttle engine sprites
2020-08-29 21:40:46 -07:00
silicons
cce4c944ad Merge pull request #13297 from Detective-Google/more-snaxi-changes
another batch of snaxi improvements
2020-08-29 21:40:39 -07:00
CitadelStationBot
896a18136b Automatic changelog generation for PR #13298 [ci skip] 2020-08-29 23:40:26 -05:00
silicons
d4bc6f9fee Merge pull request #13298 from DeltaFire15/eminence-updates
Modifies the Eminence teleport-to abilties a bit
2020-08-29 21:40:22 -07:00
CitadelStationBot
7c11f4ec4a Automatic changelog generation for PR #13302 [ci skip] 2020-08-29 23:40:17 -05:00
silicons
1ed712d69d Merge pull request #13302 from necromanceranne/mecha_backstab_fix_port
ports #52214 from /tg/: fix for mecha backstabbing
2020-08-29 21:40:13 -07:00
CitadelStationBot
38f91531de Automatic changelog generation for PR #13024 [ci skip] 2020-08-29 23:36:01 -05:00
silicons
bf678a25da Merge pull request #13024 from zeroisthebiggay/saltprfuckwaffles
The PR That Comments Out Waffleco From Appearing AKA Fuck The Traitors ERPing Every Single Round
2020-08-29 21:35:58 -07:00
silicons
9250a6d71d Merge pull request #13275 from Chiirno/portable-chem-mixer
Portable chem mixer
2020-08-29 21:34:57 -07:00
CitadelStationBot
fd13b3b4b1 Automatic changelog generation for PR #13230 [ci skip] 2020-08-29 23:33:31 -05:00
silicons
16fec8831a Merge pull request #13230 from Detective-Google/reskin-obj
reskin_obj is now a radial
2020-08-29 21:33:28 -07:00
CitadelStationBot
b2d9f132f3 Automatic changelog generation for PR #13229 [ci skip] 2020-08-29 23:33:24 -05:00
silicons
5f40c2da37 Merge pull request #13229 from Sonic121x/patch-2
Fix Tea and give them a glass sprite
2020-08-29 21:33:21 -07:00
CitadelStationBot
5fcec1bc2c Automatic changelog generation for PR #13192 [ci skip] 2020-08-29 23:33:01 -05:00
silicons
413ccdba96 Merge pull request #13192 from Putnam3145/literal-hugbox
Buffs/hugboxes slaughter demons
2020-08-29 21:32:58 -07:00
CitadelStationBot
dda0a2ac66 Automatic changelog generation for PR #12957 [ci skip] 2020-08-29 23:31:27 -05:00
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