Commit Graph
8639 Commits
Author SHA1 Message Date
siliconsandGitHub ffe3eeecde Merge pull request #13017 from Hatterhat/coor-dharges
door charges no longer unconscious() you
2020-08-05 15:09:14 -07:00
Sishen ec8cd31950 funny chair loses block chance and gains active block/parry 2020-08-05 14:21:48 -06:00
Letter N f2f6416105 fixes - radio, broken - crewmanifest, gastank controler 2020-08-05 20:34:09 +08:00
siliconsandGitHub 3e2ab66afa Update shields.dm 2020-08-04 21:34:59 -07:00
timothyteakettle 9d52189364 add ricochets to way more things 2020-08-05 02:41:37 +01:00
timothyteakettle 3fc554d482 haha machinery go brr 2020-08-05 02:29:19 +01:00
Letter N ed67801590 what if the tgui actualy recives it's topic? 2020-08-05 09:21:19 +08:00
DeltaFire 2a197af1c0 Merge remote-tracking branch 'upstream/master' into newnew-clock-misc-stuff 2020-08-04 17:30:38 +02:00
Timothy Teakettle ef53f3faea the old system isnt needed really but sure i guess 2020-08-04 11:43:15 +01:00
Letter N 7c7d635193 what if atmos relief works? and all the other ui's gets updated 2020-08-04 12:54:55 +08: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
Letter N 454baea55f Merge remote-tracking branch 'origin/master' into TGUI-4 2020-08-04 09:31:34 +08: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 2bbe4631d6 working ricochets 2020-08-03 14:46:24 +01:00
Letter N 9a9e3ffef5 fixfixfix squared. Will not fix missing clockslab tabs, you just have to give it a category. 2020-08-03 21:14:17 +08:00
Letter N a19e306137 less redtext - updates anomalies 2020-08-03 20:53:36 +08: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
Letter N b376a6b6c4 Merge remote-tracking branch 'origin/master' into TGUI-4 2020-07-30 14:43:52 +08: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
LinandGitHub e93dddf5cc Merge pull request #12930 from Citadel-Station-13/silicons-patch-60
so you think you can parry turrets
2020-07-28 21:45:10 -05:00
silicons 0152dcda65 fix 2020-07-28 13:24:45 -07:00
silicons 8313485632 fix 2020-07-28 11:31:28 -07:00