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
LinandGitHub 447a0b24bf Merge pull request #12944 from timothyteakettle/fixes-crates 
fixes some crafted crates containing items
 2020-07-28 22:11:30 -05:00
CitadelStationBot 105cc8dc70 Automatic changelog generation for PR #12883 [ci skip] 2020-07-28 22:05:42 -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
CitadelStationBot be20861294 Automatic changelog generation for PR #12734 [ci skip] 2020-07-28 21:51:46 -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
CitadelStationBot 2e63c17456 Automatic changelog generation for PR #12834 [ci skip] 2020-07-28 21:51:14 -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
CitadelStationBot 3371022275 Automatic changelog generation for PR #12929 [ci skip] 2020-07-28 21:48:17 -05:00
LinandGitHub ae02a7348c Merge pull request #12929 from Citadel-Station-13/silicons-patch-59 
silicons (and all other nonhuman mobs) can now block (with the right items)
 2020-07-28 21:48:14 -05:00
CitadelStationBot 13e50ced55 Automatic changelog generation for PR #12928 [ci skip] 2020-07-28 21:48:07 -05:00
LinandGitHub e8ab87c396 Merge pull request #12928 from Citadel-Station-13/silicons-patch-58 
silicons (and any other nonhuman mob) can now parry
 2020-07-28 21:48:03 -05:00
CitadelStationBot 9e07eeb84d Automatic changelog generation for PR #12932 [ci skip] 2020-07-28 21:45:58 -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
CitadelStationBot 3825bb73df Automatic changelog generation for PR #12930 [ci skip] 2020-07-28 21:45:14 -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
Changelogs 7bc458b43e Automatic changelog compile [ci skip] 2020-07-29 00:11:03 +00:00
Artur ef39e62e39 Makes bloodsucker death not spam now actually working 2020-07-29 02:11:14 +03:00
Artur e0d9c7972d Makes it actually work 2020-07-29 01:50:40 +03:00
CitadelStationBot 8c2e23e603 Automatic changelog generation for PR #12948 [ci skip] 2020-07-28 15:27:16 -05:00
siliconsandGitHub 93da2515b6 Merge pull request #12948 from Hatterhat/windows 
[speedmerge? it's not that bad i swear] directional window rotation fix
 2020-07-28 13:27:12 -07:00
CitadelStationBot 08a6d140aa Automatic changelog generation for PR #12942 [ci skip] 2020-07-28 15:26:26 -05:00
siliconsandGitHub d8378e64be Merge pull request #12942 from DeltaFire15/outfit-fix 
Fixes the 'Naked' outfit
 2020-07-28 13:26:23 -07:00
CitadelStationBot 1ef086dffb Automatic changelog generation for PR #12951 [ci skip] 2020-07-28 15:26:11 -05:00
siliconsandGitHub ab67ae3291 Merge pull request #12951 from timothyteakettle/haha-yes-blood 
bloodsucker blood loss fix
 2020-07-28 13:26:07 -07:00
silicons 0152dcda65 fix 2020-07-28 13:24:45 -07:00
Artur 09f2594c37 Plugs bloodsucker LifeTick into BiologicalLife 2020-07-28 22:58:13 +03:00
dapnee f53280c9b7 adds another atmos tech spawn 
treading on justin's pr by accident, oops
 2020-07-28 13:46:10 -06:00
DeltaFire aa0670e34c Updates the clockie delay structure 
Prolonging prisms exist again. They can be built application-tier and take one minute to delay the shuttle by two minutes (So, basically, you end up with one minute more on the timer before it started). It costs 2000 power for the initial use, and 1000 additional power per time it was already used. Oh, and it creates a reeeaaally obvious effect pointing anyone towards the structure. So, good luck defending it.
Also fixes up some scripture sorting but that's minor.
 2020-07-28 21:37:05 +02:00
silicons c87c2bd850 smh 2020-07-28 12:31:35 -07:00
silicons 78b6a60e80 oh 2020-07-28 12:25:27 -07:00
silicons fd738fd16a spelling 2020-07-28 12:12:30 -07:00
silicons 4ab175d812 sigh 2020-07-28 12:10:34 -07:00
silicons c720e800df whew! 2020-07-28 12:08:02 -07:00
Adelphon 1f508ef15d Adds Camo To AutoDrobe (fix) 
Adds syndicate Camo to Autodrobe WITHOUT the armor bonuses.
 2020-07-28 15:04:58 -04:00
silicons 8313485632 fix 2020-07-28 11:31:28 -07:00
dapnee 170afed3bc oops 
forgot the sinks in the locker room
 2020-07-28 12:16:31 -06:00
dapnee 1540d66e88 Minor Fixes to Box 
backwards sinks and such
 2020-07-28 12:00:35 -06:00
CitadelStationBot 469ea17063 Automatic changelog generation for PR #12938 [ci skip] 2020-07-28 12:46:38 -05:00
siliconsandGitHub e9d1bcc899 Merge pull request #12938 from necromanceranne/sprite-fixes-rapier 
adds some in-hands for the rapier sheath
 2020-07-28 10:46:34 -07:00
CitadelStationBot 60825a79b8 Automatic changelog generation for PR #12937 [ci skip] 2020-07-28 12:46:22 -05:00
siliconsandGitHub 6c83beea02 Merge pull request #12937 from Ghommie/Ghommie-cit834 
Fixing new bugs and stuff.
 2020-07-28 10:46:17 -07:00
CitadelStationBot ff306b7005 Automatic changelog generation for PR #12936 [ci skip] 2020-07-28 12:45:58 -05:00
siliconsandGitHub cac1627d26 Merge pull request #12936 from zeroisthebiggay/weenjoystealingfashion 
Ports RP flannel jackets and a winter coat
 2020-07-28 10:45:54 -07:00
CitadelStationBot 4dce4521f4 Automatic changelog generation for PR #12941 [ci skip] 2020-07-28 12:45:35 -05:00
siliconsandGitHub a5063a92b9 Merge pull request #12941 from timothyteakettle/alien-embeds-work 
aliens can remove embeds now
 2020-07-28 10:45:31 -07:00
CitadelStationBot c820efcaf1 Automatic changelog generation for PR #12940 [ci skip] 2020-07-28 12:45:20 -05:00
siliconsandGitHub b17a191aeb Merge pull request #12940 from necromanceranne/stunbaton_sprite_new 
Ports #52320, Stun baton sprites by Sirich96, and new stunsword sprites
 2020-07-28 10:45:16 -07:00
Timothy Teakettle c8960624d3 sorry artur 2020-07-28 18:37:01 +01:00
Keate Senior af02490739 still conflicts with clickdelays bluh whatever I'll fix it if its merged 2020-07-28 13:21:27 -04:00