Commit Graph

42444 Commits

Author SHA1 Message Date
silicons
42589fc55d Merge pull request #14570 from BlueWildrose/tellmeabouttheelves
Sylvan and Mushroom languages now tongueless, EaL learnable
2021-04-08 03:24:24 -06:00
CitadelStationBot
58da2a26f1 Automatic changelog generation for PR #14551 [ci skip] 2021-04-08 04:24:00 -05:00
silicons
f998efa7bc Merge pull request #14551 from BlueWildrose/ThePuddler2
This was going to just be a fix for slime puddles making mutation and cult visual indicators disappear but it ended up becoming more complicated than I thought
2021-04-08 03:23:57 -06:00
CitadelStationBot
788cfbe14f Automatic changelog generation for PR #14552 [ci skip] 2021-04-08 04:23:35 -05:00
silicons
3416989b7c Merge pull request #14552 from BlueWildrose/PillsHere
I could blot the sun out with these titty pills and some certain catgirls here STILL wouldn't be satisfied.
2021-04-08 03:23:32 -06:00
CitadelStationBot
7d16544131 Automatic changelog generation for PR #14562 [ci skip] 2021-04-08 04:23:24 -05:00
silicons
a367a057e4 Merge pull request #14562 from BlueWildrose/poppinoff
Buffs the genetic mutation Autotomy
2021-04-08 03:23:22 -06:00
CitadelStationBot
e617064921 Automatic changelog generation for PR #14535 [ci skip] 2021-04-08 04:22:58 -05:00
silicons
f1de2d37aa Merge pull request #14535 from brokenOculus/adds-Telescopic-Baseball-bat
Adds telescopic baseball bat
2021-04-08 03:22:56 -06:00
CitadelStationBot
c106b9b218 Automatic changelog generation for PR #14540 [ci skip] 2021-04-08 04:22:49 -05:00
silicons
bda9f2ac76 Merge pull request #14540 from SandPoot/fixing-lizzies
Fixes some lizards
2021-04-08 03:22:46 -06:00
Changelogs
61928070a2 Automatic changelog compile [ci skip] 2021-04-07 00:07:10 +00:00
CitadelStationBot
36db52efc1 Automatic changelog generation for PR #14418 [ci skip] 2021-04-06 05:10:09 -05:00
silicons
cbd7e0de6a Merge pull request #14418 from LetterN/perlin-genny
Updates openspace & enables perlin generation on alvaland & icebox/snaxi
2021-04-06 04:10:00 -06:00
Changelogs
d1040001f6 Automatic changelog compile [ci skip] 2021-04-06 00:07:24 +00:00
CitadelStationBot
56d0390fcf Automatic changelog generation for PR #14559 [ci skip] 2021-04-05 16:19:32 -05:00
Lin
6d82cbe363 Merge pull request #14559 from BlueWildrose/dingdong
Brings back the prayer ding
2021-04-05 16:19:30 -05:00
CitadelStationBot
31ceef94d4 Automatic changelog generation for PR #14566 [ci skip] 2021-04-05 16:07:32 -05:00
Lin
c08f90a3eb Merge pull request #14566 from TheObserver-sys/CabbageFix
Botany Pass 3: THE CABBAGE PATCH PEOPLE MUST DIE.
2021-04-05 16:07:30 -05:00
CitadelStationBot
548f017a2b Automatic changelog generation for PR #14567 [ci skip] 2021-04-05 11:37:10 -05:00
Lin
462486e39d Merge pull request #14567 from Putnam3145/bad-copypasta
fixes forced climax causing a climax-with
2021-04-05 11:37:07 -05:00
CitadelStationBot
fa1cdb20b6 Automatic changelog generation for PR #14547 [ci skip] 2021-04-04 23:22:43 -05:00
Lin
c65b1791d0 Merge pull request #14547 from SandPoot/lockers-and-laptops
Fixing some issues for laptops and lockers/crates.
2021-04-04 23:22:41 -05:00
CitadelStationBot
72ec59ca79 Automatic changelog generation for PR #14565 [ci skip] 2021-04-04 23:18:58 -05:00
Lin
05ae354d87 Merge pull request #14565 from DeltaFire15/wood-pack-correction
Corrects the wood plank crate's name and description
2021-04-04 23:18:55 -05:00
Blue Wildrose
6c79090bc2 Certain languages tongueless, machine language learnable 2021-04-04 12:25:33 -07:00
Putnam
a9d73424d6 fixes a bad copypasta 2021-04-04 00:10:06 -07:00
Changelogs
2c230c6490 Automatic changelog compile [ci skip] 2021-04-04 00:12:20 +00:00
DrPainis
29451ee9ae organic repair surgery can be done on a cyborg torso (#14435)
* repair surgery can be done on a cyborg torso

because no

* uuuuhhhh Silicons asked me to do this

* no organic repair surgery on robots
2021-04-04 00:18:43 +02:00
CitadelStationBot
11e3c1864e Automatic changelog generation for PR #14564 [ci skip] 2021-04-03 17:12:54 -05:00
Hatterhat
8b412d7d49 Update materials.dm (#14564) 2021-04-04 00:12:52 +02:00
Eric
7a135d2346 Adds Telescopic bat to uplink Baseball bundle. 2021-04-03 17:11:06 -05:00
Eric
08c89f421a updates telescopic bat inhand sprites 2021-04-03 17:07:25 -05:00
DeltaFire
1e2b4c5a20 fix 2021-04-04 00:06:18 +02:00
Eric
65bcb8fc35 removes bat attaching to belt
seems a little OP I guess?
2021-04-03 16:58:08 -05:00
Blue Wildrose
49c3284f16 linters quit complaining. 2021-04-03 12:45:52 -07:00
Blue Wildrose
e29beaf852 I'll use this linter error as an opportunity to fix some grammar 2021-04-03 11:26:35 -07:00
Blue Wildrose
d55bb8231d Buffs autotomy 2021-04-03 10:55:34 -07:00
Changelogs
a9b0676f73 Automatic changelog compile [ci skip] 2021-04-03 00:06:57 +00:00
The0bserver
989fb101f0 No more Human Harvests! 2021-04-02 20:05:50 -04:00
The0bserver
976ca8b48b Merge remote-tracking branch 'Upstream/master' 2021-04-02 19:57:41 -04:00
CitadelStationBot
daba531fea Automatic changelog generation for PR #14539 [ci skip] 2021-04-02 12:48:58 -05:00
Putnam3145
e509f1956d Removed cloning destroy; removed commented-out objs (#14539) 2021-04-02 19:48:55 +02:00
CitadelStationBot
82b58ea5fe Automatic changelog generation for PR #14558 [ci skip] 2021-04-02 12:44:25 -05:00
DeltaFire
b7eac4b8bb Merge pull request #14558 from BlueWildrose/buckbumble
Bumbles no longer has a number beside their name
2021-04-02 19:44:23 +02:00
CitadelStationBot
87b20dc22e Automatic changelog generation for PR #14542 [ci skip] 2021-04-02 12:42:43 -05:00
DeltaFire
dd8c5e97f1 Merge pull request #14542 from Putnam3145/observe-log
Added observe logging
2021-04-02 19:42:41 +02:00
Blue Wildrose
3d8f8ffe27 Bringin' back the ding 2021-04-02 02:19:19 -07:00
Changelogs
bfdfa96585 Automatic changelog compile [ci skip] 2021-04-02 00:12:57 +00:00
Blue Wildrose
f1ef779e58 Bumbles no longer has a number beside their name 2021-04-01 16:53:47 -07:00