Commit Graph
16598 Commits
Author SHA1 Message Date
raspy-on-osu 9b56991f77 init 2020-09-02 17:54:35 -04:00
Ghommie dc9b024fae Blemishes begone. 2020-09-02 19:16:16 +02:00
timothyteakettle 594fd17f23 test 2020-09-02 15:34:13 +01:00
lolman360 5697ab2ff4 Merge remote-tracking branch 'upstream/master' into AnPrimAssistants 2020-09-01 16:57:02 +10:00
siliconsandGitHub aee7974140 Update astral.dm 2020-08-31 22:34:19 -07:00
siliconsandGitHub 10fdc4427a Merge pull request #13305 from Tupinambis/maintloot2
Removes growth pills and genital autosurgeons from the maint loot table. Shoves them in the kinkmates.
2020-08-31 21:21:46 -07:00
siliconsandGitHub 9a4f9aef6e Merge pull request #13307 from raspy-on-osu/pyroanomaly-slimespawn-spam
pyro anomaly spam salt pr (offer_control now supports ignore_category)
2020-08-31 21:21:09 -07:00
siliconsandGitHub 0dc96492a1 Merge pull request #13308 from Putnam3145/save_character_unit_test
Adds a character saving unit test
2020-08-31 21:20:48 -07:00
siliconsandGitHub 77cf561f7f Merge pull request #13316 from timothyteakettle/ckey-pref
pref for hiding your ckey from roundend report
2020-08-31 21:19:37 -07:00
lolman360 1b52ceb63a Various changes. 2020-09-01 11:43:01 +10:00
lolman360 05bd0579ca Merge remote-tracking branch 'upstream/master' into AnPrimAssistants 2020-09-01 11:23:57 +10:00
lolman360 4d6fb10dff Nyoops. 2020-09-01 10:55:55 +10:00
lolman360 400391e8d8 Bronze anvil tweaks, clarity. 2020-09-01 10:37:56 +10:00
Putnam c8f947011f Makes ghost dojo hilbert hotel not easily enterable. 2020-08-31 05:43:56 -07:00
Blue Wildrose cc9648c08d Update slime.dm 2020-08-30 23:19:18 -07:00
timothyteakettle af2c7b295e ah yes 2020-08-31 02:25:54 +01:00
timothyteakettle a9ec2254ba hide your ckey 2020-08-31 01:47:49 +01:00
siliconsandGitHub 4bfa6d0a06 Merge pull request #13294 from Putnam3145/health-event-fix
Added health exemption to a couple events that need it.
2020-08-30 13:15:10 -07:00
Putnam cba2a1645b Makes pool actually check for the reagent instead of checking for a number. 2020-08-30 06:16:21 -07:00
TrilbyspacecloneandGitHub da641c9b96 Update necropolis_chests.dm 2020-08-30 02:10:59 -04:00
Putnam 66899faa72 needs that var/ 2020-08-29 23:10:13 -07:00
Putnam 3097c790b8 Added an extra test. 2020-08-29 23:02:18 -07:00
Putnam e97ef2d84d Added a character saving unit test. 2020-08-29 22:58:04 -07:00
raspy-on-osu c90c46a2d1 mob_spawners 2020-08-30 01:50:55 -04:00
TrilbyspacecloneandGitHub 9c8f3305bb Merge branch 'master' into spike-loot-differentces 2020-08-30 00:41:42 -04:00
siliconsandGitHub bf27de1aec Merge pull request #13292 from Putnam3145/fix-dynamic-again
Rolling dynamic tweaks 'til it works
2020-08-29 21:41:06 -07:00
siliconsandGitHub 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
siliconsandGitHub 05b5d39732 Update ballistic.dm 2020-08-29 21:38:45 -07:00
siliconsandGitHub 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
Tupinambis 39eac62dcd moves growth pills and genital autosurgeons to the kinkmate 2020-08-29 23:35:35 -05:00
siliconsandGitHub 9250a6d71d Merge pull request #13275 from Chiirno/portable-chem-mixer
Portable chem mixer
2020-08-29 21:34:57 -07:00
siliconsandGitHub 16fec8831a Merge pull request #13230 from Detective-Google/reskin-obj
reskin_obj is now a radial
2020-08-29 21:33:28 -07:00
siliconsandGitHub 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
siliconsandGitHub 413ccdba96 Merge pull request #13192 from Putnam3145/literal-hugbox
Buffs/hugboxes slaughter demons
2020-08-29 21:32:58 -07:00
siliconsandGitHub 033feebcd0 Merge pull request #12957 from kappa-sama/patch-34
removes malf disk from tendril loot
2020-08-29 21:31:24 -07:00
siliconsandGitHub 50cf863501 Merge pull request #13263 from raspy-on-osu/tesla-groundingrodspull
Tesla Counterplay.
2020-08-29 21:24:41 -07:00
siliconsandGitHub 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
siliconsandGitHub 84734591ed Merge pull request #13268 from timothyteakettle/accents
separates tongues speech handling into accent datums
2020-08-29 21:22:11 -07:00
siliconsandGitHub 78b8072d13 Merge pull request #13272 from Detective-Google/patch-1
plasmamen are playable now
2020-08-29 21:21:23 -07:00
siliconsandGitHub 7ad037ee53 Merge pull request #13276 from timothyteakettle/emotes
every emote is unrestricted
2020-08-29 21:21:01 -07:00
siliconsandGitHub e677804bd7 Merge pull request #13277 from Chiirno/AnaPanRework
Reworks Anatomic Panacea
2020-08-29 21:19:47 -07:00
siliconsandGitHub 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
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 ad1ab7c7c4 Merge pull request #13290 from ForrestWick/funnynoclip
Nukies can't get wall-boots anymore
2020-08-29 21:17:26 -07:00
Putnam dd6be82e06 Made heretics scale dynamic threat with power. 2020-08-29 18:43:15 -07:00
Putnam 6725ced453 Makes heretics actually able to be edited in the config. 2020-08-29 16:45:16 -07:00
DeltaFire 105c98d12f eminence moment
commants out 'teleport to ark', gives the Eminence the ability to teleport to obelisks instead.
2020-08-29 21:30:20 +02:00
Putnam 177bfaefaf Added health exemption to a couple events that need it. 2020-08-29 04:46:18 -07:00
lolman360 f223c9eeb5 eee 2020-08-29 18:38:17 +10:00
Letter N fe17bee28e reverts thing kev said about 2020-08-29 14:36:41 +08:00