shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
42,456 Commits 5 Branches 0 Tags
834ec62c0b6b3e4cf28726d7dff33338d9ac34a3
Commit Graph
42456 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
keronshb 834ec62c0b Nightmare Jaunt Change 
Prevents Nightmares from being pulled OUT of jaunt from vendors and engraved messages.
 2021-05-03 00:05:39 -04:00
keronshb 31a71bc9ee Merge remote-tracking branch 'upstream/master' 2021-04-09 12:44:49 -04:00
Changelogs 9849fa0e22 Automatic changelog compile [ci skip] 2021-04-09 00:07:07 +00:00
siliconsandGitHub 08cd9b1bfd Merge pull request #14576 from SandPoot/another-locker-change-thing 
Another closet change
 2021-04-08 03:24:59 -06:00
CitadelStationBot 70da051afb Automatic changelog generation for PR #14577 [ci skip] 2021-04-08 04:24:53 -05:00
siliconsandGitHub 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
CitadelStationBot 3dea60a26b Automatic changelog generation for PR #14574 [ci skip] 2021-04-08 04:24:38 -05:00
siliconsandGitHub 9105413f69 Merge pull request #14574 from BlueWildrose/swippityswap 
Container swapping for Pandemic machine
 2021-04-08 03:24:36 -06:00
CitadelStationBot 3d29b3b1cb Automatic changelog generation for PR #14570 [ci skip] 2021-04-08 04:24:26 -05:00
siliconsandGitHub 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
siliconsandGitHub 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
siliconsandGitHub 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
siliconsandGitHub 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
siliconsandGitHub 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
siliconsandGitHub 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
SandPoot c15852f47b upload _machinery.dm 2021-04-06 19:27:52 -03:00
SandPoot 29bf226fe1 upload closets.dm 2021-04-06 18:18:08 -03:00
CitadelStationBot 36db52efc1 Automatic changelog generation for PR #14418 [ci skip] 2021-04-06 05:10:09 -05:00
siliconsandGitHub 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
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
LinandGitHub 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
LinandGitHub 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
LinandGitHub 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
LinandGitHub 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
LinandGitHub 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
DrPainisandGitHub 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
HatterhatandGitHub 8b412d7d49 Update materials.dm (#14564) 2021-04-04 00:12:52 +02:00
EricandGitHub 7a135d2346 Adds Telescopic bat to uplink Baseball bundle. 2021-04-03 17:11:06 -05:00
EricandGitHub 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
EricandGitHub 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