7ca46715d7
Merge branch 'master' into cargo-bugfixes
2021-04-08 19:15:55 -03:00
a7c061392b
i hate tg code
2021-04-08 18:05:36 -04:00
08cd9b1bfd
Merge pull request #14576 from SandPoot/another-locker-change-thing
...
Another closet change
2021-04-08 03:24:59 -06:00
b2fcded98d
Merge pull request #14577 from SandPoot/fixes-machines
...
Prevents machines that open from dropping their components
2021-04-08 03:24:51 -06:00
9105413f69
Merge pull request #14574 from BlueWildrose/swippityswap
...
Container swapping for Pandemic machine
2021-04-08 03:24:36 -06:00
42589fc55d
Merge pull request #14570 from BlueWildrose/tellmeabouttheelves
...
Sylvan and Mushroom languages now tongueless, EaL learnable
2021-04-08 03:24:24 -06:00
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
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
a367a057e4
Merge pull request #14562 from BlueWildrose/poppinoff
...
Buffs the genetic mutation Autotomy
2021-04-08 03:23:22 -06:00
f1de2d37aa
Merge pull request #14535 from brokenOculus/adds-Telescopic-Baseball-bat
...
Adds telescopic baseball bat
2021-04-08 03:22:56 -06:00
bda9f2ac76
Merge pull request #14540 from SandPoot/fixing-lizzies
...
Fixes some lizards
2021-04-08 03:22:46 -06:00
a625b1d770
Fixed drones nullspacing things they place on tables and in closets
2021-04-07 21:45:04 -07:00
cd81345e9f
Polishing up the new slimeperson organs also WHY IS THE SLIMEBRAIN SPRITE GONE
2021-04-07 15:00:09 -07:00
c104ab1fc4
sex
2021-04-07 04:54:06 -04:00
cb7259f4e2
sex
2021-04-07 04:44:57 -04:00
657d1f69c8
sex
2021-04-07 04:18:04 -04:00
3cf25a8cc7
Slimeperson organs are now more confusing
2021-04-06 23:10:23 -07:00
c15852f47b
upload _machinery.dm
2021-04-06 19:27:52 -03:00
eff724a3f5
time to LOUD
2021-04-06 18:57:00 -03:00
29bf226fe1
upload closets.dm
2021-04-06 18:18:08 -03:00
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
9239c1eb52
Beaker swapping for Pandemic machine
2021-04-05 23:06:35 -07:00
de6b3552d5
that grammar would make me mad if I left it there why did I do that
2021-04-05 22:59:24 -07:00
80e9437390
add some game logging for good measure
2021-04-05 21:47:15 -07:00
f1b45b3839
eatshitanddie
2021-04-05 21:55:17 -04:00
6d82cbe363
Merge pull request #14559 from BlueWildrose/dingdong
...
Brings back the prayer ding
2021-04-05 16:19:30 -05:00
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
462486e39d
Merge pull request #14567 from Putnam3145/bad-copypasta
...
fixes forced climax causing a climax-with
2021-04-05 11:37:07 -05:00
fb79a2033d
usr.name into user, also adding in do_after.
2021-04-04 21:34:27 -07:00
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
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
414d9d43e3
adding a gap here
2021-04-04 18:50:11 -07:00
43d855c413
Killable space pirate sleepers
2021-04-04 17:05:18 -07:00
6c79090bc2
Certain languages tongueless, machine language learnable
2021-04-04 12:25:33 -07:00
a9d73424d6
fixes a bad copypasta
2021-04-04 00:10:06 -07:00
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
8b412d7d49
Update materials.dm ( #14564 )
2021-04-04 00:12:52 +02:00
7a135d2346
Adds Telescopic bat to uplink Baseball bundle.
2021-04-03 17:11:06 -05:00
1e2b4c5a20
fix
2021-04-04 00:06:18 +02:00
65bcb8fc35
removes bat attaching to belt
...
seems a little OP I guess?
2021-04-03 16:58:08 -05:00
49c3284f16
linters quit complaining.
2021-04-03 12:45:52 -07:00
e29beaf852
I'll use this linter error as an opportunity to fix some grammar
2021-04-03 11:26:35 -07:00
d55bb8231d
Buffs autotomy
2021-04-03 10:55:34 -07:00
989fb101f0
No more Human Harvests!
2021-04-02 20:05:50 -04:00
e509f1956d
Removed cloning destroy; removed commented-out objs ( #14539 )
2021-04-02 19:48:55 +02:00
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
dd8c5e97f1
Merge pull request #14542 from Putnam3145/observe-log
...
Added observe logging
2021-04-02 19:42:41 +02:00
3d8f8ffe27
Bringin' back the ding
2021-04-02 02:19:19 -07:00
f1ef779e58
Bumbles no longer has a number beside their name
2021-04-01 16:53:47 -07:00
4de7af5db5
Bumbles no longer has a number beside their name
2021-04-01 16:31:15 -07:00
qweq12yt