shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
43,455 Commits 5 Branches 0 Tags
fd0afa209f5bc4dee5178eb02bf2ecaf682c1da4
Commit Graph

6043 Commits

Author SHA1 Message Date
silicons
4768b23398 Merge pull request #14860 from Arturlang/nanite_updates 
Updates our nanite stuff to TG's, mostly
 2021-06-18 20:01:05 -07:00
Artur
5619b73e6b Makes it actually, actually work 2021-06-16 02:02:28 +03:00
Artur
724b34f55d https://github.com/tgstation/tgstation/pull/54710 2021-06-16 00:44:32 +03:00
Timothy Teakettle
baad78e7fe bee 2021-06-11 16:08:55 +01:00
silicons
5e4f3ed694 Merge pull request #14683 from keronshb/shovedisarmgun 
Off Balance Disarms only if shoved into a wall or person.
 2021-06-09 12:14:37 -07:00
silicons
09d61c3bec Merge pull request #14776 from WanderingFox95/WanderingFox95-CatSurgeon 
New Challenger: The Cat Surgeon has appeared! (Ready!)
 2021-06-09 11:29:24 -07:00
silicons
eb4b4088f4 Merge pull request #14760 from keronshb/floorcluwneport 
Ports Floor Cluwnes and Cluwnes.
 2021-06-09 11:21:22 -07:00
silicons
ec63a4c62b Merge pull request #14779 from Arturlang/Orbit_menu_antags 
Makes orbit menu show antags if DNR
 2021-06-09 11:17:14 -07:00
silicons
c0e3b8d5ef Merge pull request #14809 from SandPoot/speak-nice-yes 
Centralizes borg speech and uses some of the icons for the typing indicator
 2021-06-09 11:15:01 -07:00
silicons
259aed7903 Merge pull request #14783 from DeltaFire15/spec-species-color 
Colors species names depending on traits
 2021-06-09 11:14:48 -07:00
SandPoot
b0940456f5 upload files 2021-06-08 13:13:22 -03:00
keronshb
40f9941849 Fixes invisibility when being dragged and glass table cheese 2021-06-04 22:52:03 -04:00
DeltaFire
b2e2c49011 plasmamen & golems 2021-06-02 17:47:57 +02:00
DeltaFire
0f01a4a7da huh 2021-06-01 22:52:39 +02:00
DeltaFire
dd33371a3b colors 2021-06-01 22:48:57 +02:00
keronshb
70926f5daf Merge remote-tracking branch 'upstream/master' into floorcluwneport 2021-05-31 22:21:34 -04:00
Arturlang
84db564e0f Prettier? code 2021-06-01 02:25:06 +03:00
Arturlang
4b541d3dac phonecode 2021-06-01 02:21:33 +03:00
Artur
8687312935 Makes orbit menu show antags if DNR 2021-05-31 18:14:06 +03:00
WanderingFox95
df0e1057d1 Imagine this crazy person became a threat suddenly 2021-05-30 21:15:44 +02:00
zerothebigboy
7dea33f6c2 doge 2021-05-27 16:08:28 -04:00
keronshb
7dbab19597 Fixes the linters and adds a proper async 2021-05-27 00:14:43 -04:00
keronshb
78db6bd5c2 Ports Floor Cluwnes 
Oh fuck oh god
 2021-05-26 21:58:35 -04:00
silicons
eba3f554bc Merge pull request #14737 from zeroisthebiggay/KILL 
Traitor's Bizarre Adventure Episode One: Mauler Gauntlets Are Unbreakable
 2021-05-23 08:52:25 -06:00
zerothebigboy
25c99bb23c fuckihatecoding 2021-05-22 11:52:55 -04:00
zerothebigboy
37c3bc23a8 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into hair 
# Conflicts:
 2021-05-22 07:21:02 -04:00
silicons
92e019dd56 Merge pull request #14716 from Putnam3145/fix-blacklisting-traits 
Makes species/antag trait blacklist no longer remove ALL traits
 2021-05-22 03:41:57 -06:00
silicons
e1a800ff49 Merge pull request #14742 from keronshb/specialhudport 
(READY) Ports Special Hud icons for some simple mobs
 2021-05-22 01:37:59 -06:00
silicons
acdb57b0d1 Merge pull request #14739 from WanderingFox95/WanderingFox95-Ears 
A small ear related PR (Deer ears, Rabbit ears)
 2021-05-22 01:37:05 -06:00
zerothebigboy
af24fef322 inari 2021-05-21 20:46:48 -04:00
zerothebigboy
f54c893748 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into hair 2021-05-20 18:57:51 -04:00
keronshb
a6e157ba73 IT WORKS!! 2021-05-19 19:03:21 -04:00
Lin
0c77834c56 Merge pull request #14733 from qweq12yt/misc-fixes 
[Fix] Even More bug fixing
 2021-05-19 14:49:00 -05:00
zerothebigboy
bc61ada440 KILL 2021-05-19 13:24:40 -04:00
keronshb
60965939d6 bigger mobs have some special health bars (#49104) 
* cool beans

* more, more!

* smol fix
 2021-05-19 11:59:50 -04:00
WanderingFox95
0294ddb2a6 Apply suggestions from code review 
Co-authored-by: zeroisthebiggay <43571008+zeroisthebiggay@users.noreply.github.com>
 2021-05-19 13:01:13 +02:00
WanderingFox95
4cd8cbd3e4 Same changes for the non human section of the ear file. 
consistency.
 2021-05-19 12:27:32 +02:00
WanderingFox95
eab45f0d64 Apply suggestions from code review 
They're very fair.

Co-authored-by: zeroisthebiggay <43571008+zeroisthebiggay@users.noreply.github.com>
 2021-05-19 09:48:38 +02:00
zerothebigboy
e7c0dea497 actually an eris hairdo 2021-05-18 22:04:59 -04:00
zerothebigboy
89b2d74895 actually an eris hairdo 2021-05-18 22:00:35 -04:00
WanderingFox95
808e94899f Ear Adjustments 2021-05-19 01:38:28 +02:00
Putnam
030361e1cc suggestions 2021-05-18 16:18:57 -07:00
zeroisthebiggay
55383e0387 Update hair_head.dm 2021-05-18 17:27:59 -04:00
zerothebigboy
20ac75020d steponmycock 2021-05-18 17:23:07 -04:00
zeroisthebiggay
cc29443b53 Update hair_head.dm 2021-05-18 17:06:20 -04:00
zerothebigboy
2a3eb07bfd steponmycock 2021-05-18 16:57:52 -04:00
qweq12yt
ba20b5b8aa fix emag shuttle order 2021-05-17 18:48:01 -03:00
qweq12yt
9dd372ed11 fix void cloak going to the void 2021-05-17 17:33:23 -03:00
timothyteakettle
34869215e8 Merge remote-tracking branch 'upstream/master' into rp-markings-attempt-two 2021-05-14 01:59:32 +01:00
Putnam
1a92973d99 Antag/species quirk blacklist fix 2021-05-12 10:18:52 -07:00