Commit Graph

28420 Commits

Author SHA1 Message Date
Blue Wildrose 4f426f071f Revenant changes port from TG 2021-04-10 19:04:06 -07:00
Lin ae6c7a660c Merge pull request #14586 from BlueWildrose/whattheheckdrones
Fixed drones nullspacing things they try to place on tables and in closets
2021-04-10 20:03:59 -05:00
Lin 7c55e8a6f7 Merge pull request #14593 from BlueWildrose/corgiflail
Fixes phantom mob-holder items
2021-04-10 20:02:03 -05:00
Lin b6b9619f2d Merge pull request #14536 from Citadel-Station-13/silicons-patch-13
removes delta_time from tgui process because it doesn't need it
2021-04-09 14:14:03 -05:00
DrPainis 055c191e7e replaces diarrhea with mustard
yes
2021-04-09 00:55:08 -04:00
Blue Wildrose 610dd41cb9 Fixes phantom mob-holder items 2021-04-08 21:12:30 -07:00
qweq12yt c392d6e888 fix issue 2021-04-08 21:40:51 -03:00
zeroisthebiggay dccdb6cf56 Update revenant.dm 2021-04-08 20:05:03 -04:00
qweq12yt 7ca46715d7 Merge branch 'master' into cargo-bugfixes 2021-04-08 19:15:55 -03:00
zerothebigboy a7c061392b i hate tg code 2021-04-08 18:05:36 -04:00
silicons 08cd9b1bfd Merge pull request #14576 from SandPoot/another-locker-change-thing
Another closet change
2021-04-08 03:24:59 -06:00
silicons 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
silicons 9105413f69 Merge pull request #14574 from BlueWildrose/swippityswap
Container swapping for Pandemic machine
2021-04-08 03:24:36 -06:00
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
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
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
silicons a367a057e4 Merge pull request #14562 from BlueWildrose/poppinoff
Buffs the genetic mutation Autotomy
2021-04-08 03:23:22 -06: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
silicons bda9f2ac76 Merge pull request #14540 from SandPoot/fixing-lizzies
Fixes some lizards
2021-04-08 03:22:46 -06:00
Blue Wildrose a625b1d770 Fixed drones nullspacing things they place on tables and in closets 2021-04-07 21:45:04 -07:00
Blue Wildrose cd81345e9f Polishing up the new slimeperson organs also WHY IS THE SLIMEBRAIN SPRITE GONE 2021-04-07 15:00:09 -07:00
zerothebigboy c104ab1fc4 sex 2021-04-07 04:54:06 -04:00
zerothebigboy cb7259f4e2 sex 2021-04-07 04:44:57 -04:00
zerothebigboy 657d1f69c8 sex 2021-04-07 04:18:04 -04:00
Blue Wildrose 3cf25a8cc7 Slimeperson organs are now more confusing 2021-04-06 23:10:23 -07:00
SandPoot c15852f47b upload _machinery.dm 2021-04-06 19:27:52 -03:00
qweq12yt eff724a3f5 time to LOUD 2021-04-06 18:57:00 -03:00
SandPoot 29bf226fe1 upload closets.dm 2021-04-06 18:18:08 -03: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
Blue Wildrose 9239c1eb52 Beaker swapping for Pandemic machine 2021-04-05 23:06:35 -07:00
BlueWildrose 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
Blue Wildrose 80e9437390 add some game logging for good measure 2021-04-05 21:47:15 -07:00
zerothebigboy f1b45b3839 eatshitanddie 2021-04-05 21:55:17 -04:00
Lin 6d82cbe363 Merge pull request #14559 from BlueWildrose/dingdong
Brings back the prayer ding
2021-04-05 16:19:30 -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
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
Blue Wildrose fb79a2033d usr.name into user, also adding in do_after. 2021-04-04 21:34:27 -07: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
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 414d9d43e3 adding a gap here 2021-04-04 18:50:11 -07:00
Blue Wildrose 43d855c413 Killable space pirate sleepers 2021-04-04 17:05:18 -07: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
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
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
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