shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
36,377 Commits 5 Branches 0 Tags
d79cc5f85dff714e577c6ca1982f477fd2058f77
Commit Graph

23913 Commits

Author SHA1 Message Date
silicons
d79cc5f85d oof 2020-08-04 20:57:37 -07:00
silicons
0a137d2584 whew 2020-08-04 20:52:35 -07:00
silicons
65d184c552 Merge pull request #12999 from KeRSedChaplain/guardianfix 
Removes clockwork guardian's projectile deflection. OOPS!
 2020-08-01 21:05:52 -07:00
Dan-Neposh
6f2d4ac4df makes clockwork guardians have no projectile deflection 2020-08-01 23:36:36 -04:00
Lin
d107d2ec49 Merge pull request #12983 from Citadel-Station-13/silicons-patch-63 
fixes nukeops timer being from server start instead of roundstart which gives them 5 free minutes am i salty maybe just a little (no i'm not but we should fix this anyways)
 2020-08-01 19:45:42 -05:00
silicons
7e0e60c126 Merge pull request #12993 from KeRSedChaplain/toyslabfixfortravis 
Toyslabfixfortravis
 2020-08-01 13:31:33 -07:00
Dan-Neposh
44e6b6ccc7 I removed the Dread_Ipad, Clockwork Slab reigns supreme 2020-08-01 16:18:25 -04:00
silicons
e8ec73ba7d Merge pull request #12976 from Hatterhat/durathread-kits 
Durathread Reinforcement Kits
 2020-08-01 03:35:45 -07:00
silicons
128225ca6f Merge pull request #12970 from kappa-sama/patch-35 
salt pr
 2020-08-01 03:34:17 -07:00
silicons
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
silicons
8dfa3fcce8 Merge pull request #12947 from Seris02/podpersonfix 
replica pod fix bounty
 2020-08-01 03:29:16 -07:00
silicons
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
silicons
974fd83e45 Merge pull request #12975 from MrJWhit/abductor-spawntext 
Changes to abductors spawntext
 2020-08-01 00:51:18 -07:00
silicons
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
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
silicons
bc254eb31a Merge pull request #12979 from Auris456852/master 
Adds roboticist cartridge to the PDA vendor
 2020-07-31 19:45:15 -07:00
silicons
053e18247b Merge pull request #12966 from ike709/master 
CentCom Galactic Ban DB
 2020-07-31 19:44:40 -07:00
Dan-Neposh
aa605ec007 Changes the death sound for Ratvar to have more oomph behind it 2020-07-31 21:02:12 -04:00
timothyteakettle
e17e1c3a11 conforms to same as everything else 2020-07-31 22:45:03 +01:00
silicons
d1edbab264 Update life.dm 2020-07-31 14:39:40 -07:00
kappa-sama
dfa26309d1 copypaste moment 2020-07-31 17:07:47 -04:00
Lin
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
Lin
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
Lin
16fb4b3291 Merge pull request #12964 from timothyteakettle/monkeys-bleed-a-lot 
monkeys stop bleeding nonstop
 2020-07-31 14:21:57 -05:00
silicons
ad75ac0c6d Update telekinesis.dm 2020-07-31 02:30:56 -07:00
Dan-Neposh
9b3ed3009f updates the credits bit of clockwork cult 2020-07-31 00:14:23 -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
Artur
9020e59aa0 kevinz fix 2020-07-31 04:32:46 +03:00
silicons
6b87f5c87a Update syndicate.dm 2020-07-30 17:29:36 -07:00
silicons
c178e53e2a Update syndicate.dm 2020-07-30 17:25:39 -07:00
Artur
2e3922d08e Merge remote-tracking branch 'origin/master' into bloodsucker_life 2020-07-31 02:07:14 +03:00
Artur
b22ffd6b6e Makes it properly work 2020-07-31 02:07:03 +03:00
Auris456852
03cff55017 Adds roboticist cartridge to the PDA vendor. 2020-07-30 23:31:31 +03:00
Hatterhat
6dfdff34ef durathread armor kits 2020-07-30 13:38:04 -05:00
MrJWhit
2a23f88438 Whoopsie 2020-07-30 12:44:44 -04:00
MrJWhit
249cb136ef Reworks abducotr spawn text 2020-07-30 12:38:30 -04:00
kappa-sama
6356084fe9 this 2020-07-29 23:36:27 -04:00
silicons
f02bc4a572 Update toy.dm 2020-07-29 19:49:11 -07:00
Unknown
16722c47c3 CentCom Galactic Ban DB 2020-07-29 21:39:58 -05:00
timothyteakettle
caaedce6e2 end our suffering 2020-07-30 02:33:39 +01:00
timothyteakettle
55be55ce0f Revert "end our suffering" 
This reverts commit 4e1fcc4e08.
 2020-07-30 02:29:13 +01:00
timothyteakettle
4e1fcc4e08 end our suffering 2020-07-30 02:28:53 +01:00
timothyteakettle
940fe8240d monkey blood fix 2020-07-30 01:57:09 +01:00
Sishen
7fa5ccbd0e fixes slapping uplinks with non uplink items giving runtimes 2020-07-29 16:14:01 -06:00
silicons
c60e595d99 Merge pull request #12955 from Arturlang/bloodsucker_life 
Plugs bloodsucker LifeTick into BiologicalLife
 2020-07-29 14:02:22 -07:00
Lin
41a711ff01 Merge pull request #12959 from Citadel-Station-13/AAAAAAA 
FIXES LINTER ON MASTER
 2020-07-29 15:59:20 -05:00
Lin
a7fe7f1317 Merge pull request #12953 from Adelphon/pog 
Adds Camo To AutoDrobe (fix)
 2020-07-29 15:48:45 -05:00
silicons
90d3cff53f Merge remote-tracking branch 'citadel/master' into 12742 2020-07-29 11:53:59 -07:00