shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
36,499 Commits 5 Branches 0 Tags
bc2e97a2a4385846d994bd757d992cc880d2cffa
Commit Graph
36499 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
siliconsandGitHub 128225ca6f Merge pull request #12970 from kappa-sama/patch-35 
salt pr
 2020-08-01 03:34:17 -07:00
CitadelStationBot 0dbc52230f Automatic changelog generation for PR #12965 [ci skip] 2020-08-01 05:33:46 -05:00
siliconsandGitHub 2230a3665a Merge pull request #12965 from timothyteakettle/end-our-suffering 
drastically lowers the damage-related benefits of combat mode
 2020-08-01 03:33:43 -07:00
CitadelStationBot 66534fd5b6 Automatic changelog generation for PR #12947 [ci skip] 2020-08-01 05:29:19 -05:00
siliconsandGitHub 8dfa3fcce8 Merge pull request #12947 from Seris02/podpersonfix 
replica pod fix bounty
 2020-08-01 03:29:16 -07:00
siliconsandGitHub 30d82d66d1 Merge pull request #12939 from Sishen1542/iaa-iaa 
Reflavors IAA, removes certain items from IAA uplinks, adds TC stealing functionality to uplinks
 2020-08-01 02:24:01 -07:00
Heretical LizardandGitHub 71783cf760 Merge pull request #12 from Citadel-Station-13/master 
updating my branch pog
 2020-08-01 04:23:22 -04:00
CitadelStationBot 26a44997e8 Automatic changelog generation for PR #12975 [ci skip] 2020-08-01 02:51:21 -05:00
siliconsandGitHub 974fd83e45 Merge pull request #12975 from MrJWhit/abductor-spawntext 
Changes to abductors spawntext
 2020-08-01 00:51:18 -07:00
CitadelStationBot 78deda2a9a Automatic changelog generation for PR #12742 [ci skip] 2020-08-01 02:17:14 -05:00
siliconsandGitHub 320c91f4d3 Merge pull request #12742 from KeRSedChaplain/clockcultrework 
Clockwork Cult rework
 2020-08-01 00:17:11 -07:00
Dan-Neposh 11a0154ec1 changes Neovgre's sounds again 2020-08-01 01:26:35 -04:00
CitadelStationBotandb1tt3r1n0 a2f6a7c207 Automatic changelog generation for PR #12979 [ci skip] 2020-08-01 00:16:53 -04:00
Dan-Neposh 9e36d65a05 HAHAHAHA NOTHING TO SEE HERE 
THIS VARIABLE HAS ALWAYS BEEN THERE WHAT DO YOU MEAN HAHAHAHAHA
 2020-08-01 00:00:41 -04:00
Dan-Neposh 7a0dff1f77 fixes the invisible slabs and buffs a couple scripture casting times 2020-07-31 23:03:59 -04:00
CitadelStationBot 3ac679f08b Automatic changelog generation for PR #12979 [ci skip] 2020-07-31 21:45:17 -05:00
siliconsandGitHub bc254eb31a Merge pull request #12979 from Auris456852/master 
Adds roboticist cartridge to the PDA vendor
 2020-07-31 19:45:15 -07:00
CitadelStationBot d9a6069122 Automatic changelog generation for PR #12966 [ci skip] 2020-07-31 21:44:42 -05:00
siliconsandGitHub 053e18247b Merge pull request #12966 from ike709/master 
CentCom Galactic Ban DB
 2020-07-31 19:44:40 -07:00
Dan-Neposh dc70f390bb Turns out I was the one screaming all along 2020-07-31 21:40:08 -04:00
Dan-Neposh aa605ec007 Changes the death sound for Ratvar to have more oomph behind it 2020-07-31 21:02:12 -04:00
Changelogs 79590f6dc9 Automatic changelog compile [ci skip] 2020-08-01 00:40:55 +00:00
Changelogs be0740a2e7 Automatic changelog compile [ci skip] 2020-08-01 00:11:48 +00:00
CitadelStationBot f8de31695c Automatic changelog generation for PR #12988 [ci skip] 2020-07-31 17:48:50 -05:00
LinandGitHub b437383e55 Merge pull request #12988 from Citadel-Station-13/silicons-patch-65 
so it turns out mob burning checked for no oxygen instead of yes oxygen due to some other pr so you can only die of being on fire if you're in space in a hardsuit
 2020-07-31 17:48:47 -05:00
dapnee 825ac6124b missed a tile 
oopsy
 2020-07-31 16:29:25 -06:00
timothyteakettle 8d63714f3a make tongue preference dna 2020-07-31 23:04:29 +01:00
dapnee bcffff1e7d Update BoxStation.dmm 
fucking amazing
 2020-07-31 16:02:58 -06:00
timothyteakettle e17e1c3a11 conforms to same as everything else 2020-07-31 22:45:03 +01:00
siliconsandGitHub d1edbab264 Update life.dm 2020-07-31 14:39:40 -07:00
dapnee e197cb44b2 You Thought I Was Done Fucking With Box BUT YOU WERE WRONG! 
Fixed active turfs from plating that sat in space, removed random catwalk to nowhere, turned the medical console in the sleeper room to not face a window, FIXED MAINTENANCE BAR APC NOT ACTUALLY BEING FOR THE MAINTENANCE BAR. As well as fixed the xeno hive ruin on lavaland from having active turfs.
 2020-07-31 15:37:40 -06:00
kappa-samaandGitHub dfa26309d1 copypaste moment 2020-07-31 17:07:47 -04:00
LinandGitHub 159d5c1896 Merge pull request #12985 from Citadel-Station-13/silicons-patch-64 
okay so no-clickdelay telekinetic sharp-object-throwing is not okay.
 2020-07-31 14:27:14 -05:00
CitadelStationBot c7100d6e66 Automatic changelog generation for PR #12962 [ci skip] 2020-07-31 14:25:59 -05:00
LinandGitHub 0f07c8fca6 Merge pull request #12962 from dapnee/morechangestokilo 
Another Pass Over Kilo
 2020-07-31 14:25:56 -05:00
CitadelStationBot 82170264f5 Automatic changelog generation for PR #12952 [ci skip] 2020-07-31 14:24:51 -05:00
LinandGitHub 39bd5e74a4 Merge pull request #12952 from dapnee/hahabox 
Minor Fixes to Box
 2020-07-31 14:24:48 -05:00
CitadelStationBot 80c11fe998 Automatic changelog generation for PR #12967 [ci skip] 2020-07-31 14:22:15 -05:00
LinandGitHub b9848dbaee Merge pull request #12967 from Citadel-Station-13/silicons-patch-50 
you need two hands free to fire the foam force crossbow! (no, you shouldn't.)
 2020-07-31 14:22:11 -05:00
CitadelStationBot 96b44709a7 Automatic changelog generation for PR #12964 [ci skip] 2020-07-31 14:22:01 -05:00
LinandGitHub 16fb4b3291 Merge pull request #12964 from timothyteakettle/monkeys-bleed-a-lot 
monkeys stop bleeding nonstop
 2020-07-31 14:21:57 -05:00
siliconsandGitHub ad75ac0c6d Update telekinesis.dm 2020-07-31 02:30:56 -07:00
Dan-Neposh 4e7c5b0377 fixes the inhand sprite for clockwork slabs 2020-07-31 00:32:11 -04:00
Dan-Neposh 9b3ed3009f updates the credits bit of clockwork cult 2020-07-31 00:14:23 -04:00
Heretical LizardandGitHub 8b0b579c99 Merge pull request #11 from DeltaFire15/HAHA-FUCK 
Fixes the clockcult gamemode -Deltafire
 2020-07-30 23:37:52 -04:00
DeltaFire abe2f83869 Fixes the clockcult gamemode 
Servants no longer spawn / stay on the start screen and have no role (haha OOPS). Things SHOULD work now, at least on local with debug mode on, I give no guarantees.
 2020-07-31 05:30:21 +02:00
siliconsandGitHub ef9a82edde Merge pull request #12981 from Arturlang/bloodsucker_life 
Bloodsucker life
 2020-07-30 18:33:13 -07:00
Artur 9020e59aa0 kevinz fix 2020-07-31 04:32:46 +03:00
siliconsandGitHub 6b87f5c87a Update syndicate.dm 2020-07-30 17:29:36 -07:00
siliconsandGitHub c178e53e2a Update syndicate.dm 2020-07-30 17:25:39 -07:00