shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
36,592 Commits 5 Branches 0 Tags
10d23efa87dfe79647fd160574c39b8fba21cc22
Commit Graph
2755 Commits
Author SHA1 Message Date
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
siliconsandGitHub bb8dfa9236 Merge pull request #12991 from b1tt3r1n0/I'mAlreadyTracer 
I wanna be tracer
 2020-08-05 15:26:37 -07:00
siliconsandGitHub 4720fedce9 Merge pull request #13003 from Hatterhat/crusher-glaive 
Proto-Kinetic Glaives - a crusher reskin
 2020-08-05 15:25:48 -07:00
Hatterhat aa10c17b52 slight tweak pt2 2020-08-05 16:56:02 -05:00
Hatterhat 5f7d70f7d0 handguard tweak 2020-08-05 07:05:15 -05:00
DeltaFire 2a197af1c0 Merge remote-tracking branch 'upstream/master' into newnew-clock-misc-stuff 2020-08-04 17:30:38 +02:00
DeltaFire a2155f9e91 more codersprite 
clockie arm implants now have a somewhat different looking sprite (totally not just a normal arm implant recolor)
 2020-08-03 22:13:50 +02:00
Hatterhat ccee254546 proof of concept: crusherglaive - squashed 2020-08-02 12:30:14 -05:00
siliconsandGitHub f45329bfd7 Merge pull request #12912 from Linzolle/penlight 
uv penlight icon
 2020-08-01 23:12:49 -07:00
DeltaFire 7dab54e38f butchering and smol edits 2020-08-01 22:15:38 +02: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 8dfa3fcce8 Merge pull request #12947 from Seris02/podpersonfix 
replica pod fix bounty
 2020-08-01 03:29:16 -07:00
CitadelStationBotandb1tt3r1n0 a2f6a7c207 Automatic changelog generation for PR #12979 [ci skip] 2020-08-01 00:16:53 -04:00
Dan-Neposh 4e7c5b0377 fixes the inhand sprite for clockwork slabs 2020-07-31 00:32:11 -04:00
Hatterhat 6dfdff34ef durathread armor kits 2020-07-30 13:38:04 -05:00
Linzolle c83aeb4fea Merge branch 'master' of github.com:Citadel-Station-13/Citadel-Station-13 into penlight 2020-07-29 15:59:29 -05:00
silicons 90d3cff53f Merge remote-tracking branch 'citadel/master' into 12742 2020-07-29 11:53:59 -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 a560920f3c Merge pull request #12922 from timothyteakettle/let-bots-wear-hats 
beepsky hats now move with beepsky when he bobs up and down
 2020-07-28 22:17:06 -05:00
Linzolle d53738a9a5 Merge branch 'master' of github.com:Citadel-Station-13/Citadel-Station-13 into penlight 2020-07-28 22:13:49 -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
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
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
Seris02 dcd2c11f4e yay indicator 2020-07-28 20:43:38 +08:00
necromanceranne 3f84d44510 fixed it up aaaah 2020-07-28 21:33:50 +10:00
necromanceranne e9cee24608 Updates the stunbaton sprites 2020-07-28 02:01:10 +10:00
necromanceranne ef611995ed adds some in-hands for the rapier sheath 2020-07-28 00:19:47 +10:00
siliconsandGitHub 6f9c310ea8 Merge pull request #12920 from zeroisthebiggay/blackboxfatcox 
Ports the Black Box theft objective from TG
 2020-07-26 22:58:43 -07:00
siliconsandGitHub f75069a37a Merge pull request #12899 from Hatterhat/masks 
literally adds 3 pixels across the board for paper masks
 2020-07-26 22:56:39 -07:00
zerothebigboy 1c8007cf78 a 2020-07-27 00:34:28 -04:00
zerothebigboy 6329b2a760 a 2020-07-26 23:32:36 -04:00
BlackMajorandGitHub 5e3cb62790 Merge pull request #12903 from Sishen1542/zoom-zoom-go-boom-boom 
removes zoomba/roomba borg sprites
 2020-07-27 13:00:17 +12:00
siliconsandGitHub e13b6d36da Merge pull request #12895 from Hatterhat/bokken 
Training Bokkens - "funny wood sticks for parrying and beating the shit out of people"
 2020-07-26 15:52:35 -07:00
SiliconMain abdafe15fa fuck 2020-07-26 15:21:24 -05:00
Timothy Teakettle f8545b0a72 more tweaks 2020-07-26 16:59:47 +01:00
Timothy Teakettle a2f958de3a sprite tweaking 2020-07-26 16:49:06 +01:00
Timothy Teakettle 73b9ba6cdb movement sprites 2020-07-26 16:30:20 +01:00
zerothebigboy 40d12fd02f a 2020-07-26 06:20:06 -04:00
siliconsandGitHub 91081ef24c Merge pull request #12872 from Iatots/hairball 
Adds depth to the lick wounds mechanic.
 2020-07-25 15:40:15 -07:00
Hatterhat bf273cffdd burnt bokken backsprite, wound tweak 2020-07-25 16:18:26 -05:00
Linzolle f1e4f0fd94 add penlight_surgical 2020-07-25 13:50:28 -05:00
Sishen 04feb3c4a5 borg 2020-07-25 03:22:48 -06:00
Hatterhat 7ab095ef1b literally 3 pixels across the board 2020-07-24 23:49:47 -05:00
Hatterhat 89dd937a9c placeholder marker beacon 2020-07-24 21:35:55 -05:00
Hatterhat 14fba6a056 funny parry sticks 2020-07-24 21:19:01 -05:00
silicons 1f25c7f06d Merge remote-tracking branch 'citadel/master' into shoelaces 2020-07-23 16:23:34 -07:00