shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
44,933 Commits 5 Branches 0 Tags
3de08a74e71a10d45effa80f7b8a44ec3d88eebb
Commit Graph

4521 Commits

Author SHA1 Message Date
Chayse Ramsay
76fa85e683 Cyborg module sorting fixed (#15241) 2021-10-06 17:16:10 +02:00
Lin
8f9a2b6d0c Merge pull request #15235 from silicons/pai_radio_Stuff 
redoes how pai emp silencing works
 2021-10-05 12:32:23 -07:00
Lin
b18fbe695a Merge pull request #15233 from SandPoot/misc-fixes 
Some random fixes
 2021-10-05 10:27:19 -07:00
silicons
bac7bc3fb6 fix 2021-10-03 11:29:32 -07:00
SandPoot
1c80169f22 Update shields.dm 2021-10-02 22:35:54 -03:00
SandPoot
95b814d47e Upload files 2021-10-02 22:29:01 -03:00
WanderingFox95
83987db48a Merge branch 'Citadel-Station-13:master' into WanderingFox95-TribalOverhaul 2021-10-01 18:51:46 +02:00
silicons
5ff4a2ace5 Merge pull request #15180 from LetterN/achives- 
Achivement & Clowncar update
 2021-09-28 00:15:52 -07:00
WanderingFox95
d8aa29a16e Merge branch 'Citadel-Station-13:master' into WanderingFox95-TribalOverhaul 2021-09-21 14:49:15 +02:00
Lin
ab7b4e3eec Merge pull request #15181 from Citadel-Station-13/typecaches 
no more powergaming dice bags
 2021-09-20 23:59:53 -05:00
WanderingFox95
c99df01c87 Merge branch 'Citadel-Station-13:master' into WanderingFox95-TribalOverhaul 2021-09-20 00:16:27 +02:00
WanderingFox95
fe8a652689 Merge branch 'Citadel-Station-13:master' into WanderingFox95-TribalOverhaul 2021-09-19 21:32:03 +02:00
zerothebigboy
c6ce359cda Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum 
# Conflicts:
#	tgstation.dme
 2021-09-19 15:23:52 -04:00
silicons
8d914571e8 Merge pull request #15094 from zeroisthebiggay/patch-20 
removes building (fortnite) windows
 2021-09-19 11:09:55 -07:00
silicons
a40acd3cd6 Merge pull request #15176 from buffyuwu/dogborgsleeper 
fixes dogborg sleepers not working
 2021-09-19 11:09:06 -07:00
silicons
147903f654 sigh 2021-09-19 10:57:58 -07:00
LetterN
0b7e514739 t 2021-09-19 14:05:28 +08:00
buffyuwu
b9b8e32860 fixes dogborg sleepers not working 
closes #15142
 2021-09-18 05:29:42 -04:00
zerothebigboy
3c60632312 spiteful 2021-09-14 11:01:20 -04:00
zerothebigboy
68e2eb1d7a Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into prisoners 2021-09-10 12:12:57 -04:00
silicons
c600fae409 Merge pull request #15103 from SandPoot/cyborg-grippers 
Does some nice stuff on cyborg grippers
 2021-09-09 17:59:47 -07:00
silicons
69bd477a72 Merge pull request #15039 from keronshb/gradiantport 
Ports Colorist Quirk and Hair Gradients Preferences
 2021-09-08 20:41:00 -07:00
SandPoot
37e2470616 Upload files 2021-09-08 19:53:47 -03:00
zerothebigboy
3c23a09b56 bannedforbeingcringeist 2021-09-07 21:10:24 -04:00
zeroisthebiggay
70b0dad62d Update glass.dm 2021-09-07 03:26:39 -04:00
zerothebigboy
e53223a149 unversioned 2021-09-02 23:50:38 -04:00
zerothebigboy
ccfde52b0d code 2021-09-02 23:45:03 -04:00
zerothebigboy
30134a0d2f cool 2021-09-01 06:32:33 -04:00
zerothebigboy
fe90ea3ef4 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into headass 2021-09-01 05:14:27 -04:00
zerothebigboy
0e95e1a8ad cool 2021-09-01 05:14:17 -04:00
keronshb
47078e9a85 Ports Hair Gradiants 2021-08-26 11:58:09 -04:00
keronshb
e7b6c9ab5e Catwalk Flooring 2021-08-22 22:41:48 -04:00
zerothebigboy
06181f51ae Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum 
# Conflicts:
#	code/modules/ninja/suit/suit.dm
 2021-08-19 21:55:22 -04:00
silicons
51dbc8e21f Merge pull request #14685 from Arturlang/fake_blood 
Reworks blood regeneration into something a bit more tame
 2021-08-11 02:54:49 -07:00
silicons
59e541d2e7 Merge pull request #14971 from Arturlang/nanite_updates 
Ports update appearance
 2021-08-08 04:06:18 -07:00
Artur
5acd7fef2d makes salglu not deadly 2021-08-02 21:54:47 +03:00
Artur
82ccfc40dc /obj/screen --> /atom/movable/screen 2021-07-29 13:57:19 +03:00
Artur
30016f38a8 compiles 2021-07-28 02:13:57 +03:00
Artur
cdbd585f4d update_appearance 2021-07-28 02:13:57 +03:00
Putnam3145
f1560cb807 fixing a bunch of unit test/runtime issues 2021-07-25 18:40:11 -07:00
Artur
2adfbea215 Merge remote-tracking branch 'origin/master' into fake_blood 2021-07-23 18:50:09 +03:00
Lin
01ed21bb92 Merge pull request #14874 from Citadel-Station-13/silicons-patch-41 
slight baton powercreep tweak (5 --> 3.5 seconds rmb cooldown, 35 --> 40 damage)
 2021-07-22 00:53:53 -07:00
WanderingFox95
678085b966 Rogue " 2021-07-21 19:42:20 +02:00
WanderingFox95
f54f35ce40 Turns out copypasting tool descriptions is silly again. Oops. 
Co-authored-by: Arturlang <24881678+Arturlang@users.noreply.github.com>
 2021-07-21 19:38:53 +02:00
WanderingFox95
e946af558d And somehow a word went missing. 2021-07-21 19:36:35 +02:00
WanderingFox95
8ac706a1e7 Turns out copypasting tool descriptions is silly. Oops. 
Co-authored-by: Arturlang <24881678+Arturlang@users.noreply.github.com>
 2021-07-21 19:35:48 +02:00
WanderingFox95
cf350d0c96 Removes the Bowyery Slab 2021-07-20 19:01:33 +02:00
WanderingFox95
53516b9f15 Tribal Tools 
Inbetween normal and powertools
 2021-07-20 18:49:40 +02:00
WanderingFox95
f68548fb24 Expands Hunter's Belts a little 2021-07-20 18:48:28 +02:00
silicons
3070f178e0 Merge remote-tracking branch 'citadel/master' into combat_patches_1 2021-07-18 15:12:52 -07:00