shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
36,668 Commits 5 Branches 0 Tags
3068accd2bbf4a737b2b501d2da55ba41110815b
Commit Graph
8480 Commits
Author SHA1 Message Date
siliconsandGitHub 3068accd2b Merge pull request #13082 from Putnam3145/anaphro 
Removed (an)aphrodisiacs.
 2020-08-09 05:39:56 -07:00
siliconsandGitHub d25daec117 Merge pull request #13081 from Putnam3145/ethereals 
Ports ethereals from TG
 2020-08-09 05:39:43 -07:00
siliconsandGitHub bd65c8efc6 Merge pull request #13079 from Hatterhat/parry-text 
parry counterattack text now actually shows up
 2020-08-09 05:37:42 -07:00
siliconsandGitHub 88cb61b08a Merge pull request #13068 from Hatterhat/med-stack-buff 
sterilized gauze, ointment and suture stacksizes
 2020-08-09 05:36:51 -07:00
Putnam 467f66b2a6 Removed crocin/hexacrocin. 2020-08-08 00:46:30 -07:00
Putnam 9bb3ba5c5a added ethereals 2020-08-08 00:08:43 -07:00
Hatterhat 56bf84abfe parry debug stick 2020-08-08 00:48:55 -05:00
silicons 13c9954f74 fix 2020-08-07 17:00:27 -07:00
Hatterhat a7d1a0ea48 gauze! stacksizes! shit. 2020-08-07 18:40:46 -05:00
siliconsandGitHub 6876edbd85 Merge pull request #12992 from Hatterhat/rifle-book-pt2 
unatomic as shit PR about nukie guns
 2020-08-06 19:40:09 -07:00
siliconsandGitHub 009f0ebeeb Merge pull request #13013 from DeltaFire15/newnew-clock-misc-stuff 
N tvsg sebz Nezbere (or: a bunch of clockcult related stuff)
 2020-08-06 19:37:30 -07:00
LinandGitHub 865a2bf181 Merge pull request #13030 from Citadel-Station-13/silicons-patch-71 
off balanace
 2020-08-06 12:32:50 -05:00
LinandGitHub ad4a96c73a Merge pull request #13001 from Citadel-Station-13/silicons-patch-66 
makes explosions only recurse one level into storage at full power before dropping 1 level per storage object recursed
 2020-08-05 19:50:57 -05:00
LinandGitHub c310b1a70e Merge pull request #12997 from silicons/lavastaff 
fixes medsprays, sutures/regenmesh, and lavastaves not respecting clickdelay (rip instant chemdump heal on self)
 2020-08-05 19:43:38 -05:00
siliconsandGitHub bb8dfa9236 Merge pull request #12991 from b1tt3r1n0/I'mAlreadyTracer 
I wanna be tracer
 2020-08-05 15:26:37 -07:00
siliconsandGitHub ffe3eeecde Merge pull request #13017 from Hatterhat/coor-dharges 
door charges no longer unconscious() you
 2020-08-05 15:09:14 -07:00
siliconsandGitHub 3e2ab66afa Update shields.dm 2020-08-04 21:34:59 -07:00
DeltaFire 2a197af1c0 Merge remote-tracking branch 'upstream/master' into newnew-clock-misc-stuff 2020-08-04 17:30:38 +02:00
Hatterhat 6420914290 k 2020-08-03 23:45:34 -05:00
Hatterhat 25ab96cf53 funny revolver reskins 2020-08-03 20:39:06 -05:00
siliconsandGitHub 3b1826ce82 Update portable_turret.dm 2020-08-03 18:29:11 -07:00
Hatterhat 157d5c29a6 door charge nerf (tentative) 2020-08-03 19:47:04 -05:00
Timothy Teakettle 289c186f32 Merge remote-tracking branch 'upstream/master' into wounds-part-2 2020-08-02 18:11:07 +01:00
Timothy Teakettle 03d01d917f Merge branch 'master' into wounds-part-2 2020-08-02 18:10:31 +01:00
siliconsandGitHub d4d2e4ae0d Update _storage.dm 2020-08-01 21:07:07 -07:00
silicons 20dea7e41f fix 2020-08-01 20:45:49 -07:00
siliconsandGitHub 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
DeltaFire cf2b1b4d0b fixes, tweaks and brass claws 
Gives clockies a replica rabricator on roundstart, makes ratvarian spears able to parry (short parry cycle, short cooldown, timing is essence), adds brass claws to the code though they're not possible to acquire as of now.
 2020-08-01 20:28:57 +02:00
Hatterhat 6a5e26eb1c unatomic as shit 2020-08-01 12:31:13 -05:00
siliconsandGitHub e8ec73ba7d Merge pull request #12976 from Hatterhat/durathread-kits 
Durathread Reinforcement Kits
 2020-08-01 03:35:45 -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
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 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
Hatterhat 6dfdff34ef durathread armor kits 2020-07-30 13:38:04 -05:00
Sishen 7fa5ccbd0e fixes slapping uplinks with non uplink items giving runtimes 2020-07-29 16:14:01 -06:00
silicons 90d3cff53f Merge remote-tracking branch 'citadel/master' into 12742 2020-07-29 11:53:59 -07:00
Timothy TeakettleandGitHub 9721025582 Merge branch 'master' into wounds-part-2 2020-07-29 15:47:44 +01:00
silicons bc823b544f sigh 2020-07-29 01:17:16 -07:00
silicons e4148fe4ad Merge remote-tracking branch 'citadel/master' into 12742 2020-07-29 01:11:11 -07:00
siliconsandGitHub 9ff94e019b Merge pull request #12924 from SiliconMain/analyzer 
Ports long range atmos analyzer from skyrat
 2020-07-29 01:09:48 -07:00
LinandGitHub 447a0b24bf Merge pull request #12944 from timothyteakettle/fixes-crates 
fixes some crafted crates containing items
 2020-07-28 22:11:30 -05:00
LinandGitHub bbffd41d55 Merge pull request #12883 from Citadel-Station-13/silicons-patch-49 
beam rifles are now practical in emitters
 2020-07-28 22:05:39 -05:00
LinandGitHub a5dd08a054 Merge pull request #12734 from silicons/shoelaces 
shoelaces. untying people's shoelaces. admin smite to untie someone's shoelaces. credit to shaps/tg.
 2020-07-28 21:51:43 -05:00
LinandGitHub 81a7542aa6 Merge pull request #12834 from silicons/clickcd_experimental 
Experimental hybrid clickdelay system (No seriously I'm trying my best to not call it Minecraft attack delays)
 2020-07-28 21:51:10 -05:00
LinandGitHub 91dc8b96d0 Merge pull request #12932 from silicons/ok_2 
perfect parries with an energy sword now reflect projectiles back at their shooter
 2020-07-28 21:45:53 -05:00
LinandGitHub 18fa47e479 Merge pull request #12931 from Citadel-Station-13/silicons-patch-61 
nerfs parrying bullets with a wooden stick following complaints
 2020-07-28 21:45:36 -05:00