shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
45,849 Commits 5 Branches 0 Tags
b2534150ae0fcd95c79e2bb06feeefc02df1636d
Commit Graph

734 Commits

Author SHA1 Message Date
keronshb
f1ca283318 Merge branch 'master' into familyport 2022-02-11 14:04:57 -05:00
silicons
af6e43c595 refactors clickcatchers/parallax/fullsceren (#15460) 
* :)

* that

* move those there

* refactor that too

* wew

* stuff

* almost.

* sigh

* just need speed

* stuf

* pain

* hm

* tweaks

* that

* eh

* wack

* a

* done

* that's important

* wacky

* all that

* fixes

* typo

* that

* a

* funny

* that

* that

* woo

* help im losing my fucking mind

* okay

* fix
 2022-02-07 15:17:24 -08:00
keronshb
659d7aa715 Merge remote-tracking branch 'upstream/master' into familyport 2021-11-11 19:35:40 -05:00
Timothy Teakettle
8ef2ec4ac8 Update body_markings.dm 2021-11-05 15:38:25 +00:00
keronshb
9153115566 Merge remote-tracking branch 'upstream/master' into familyport 2021-11-05 10:50:08 -04:00
keronshb
8978ee10fe Merge remote-tracking branch 'upstream/master' into familyport 2021-10-28 14:41:46 -04:00
Letter N
bcdf96f274 Revert "TGUI alerts, lists, inputs" 2021-10-28 12:17:29 +08:00
keronshb
1427157df3 Fixes space cops and adds config for dynamic 2021-10-15 00:12:46 -04:00
keronshb
bf7cd77096 Fixes a few things 2021-10-13 23:25:01 -04:00
keronshb
41013ec815 Part 2 - Missing stuff from original families port 2021-10-12 12:07:02 -04:00
SandPoot
437b3105d1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into tgui-alerts-and-what-not 2021-10-08 21:05:41 -03:00
SandPoot
5aa12b4716 There's a bounty for this right? i spent nearly two full days at this 2021-10-05 18:10:32 -03:00
SandPoot
bbe32fa38a Upload files 2021-10-05 00:33:49 -03:00
keronshb
c9697f4bbf Fixes dynamic 2021-09-23 19:38:15 -04:00
keronshb
13323d2597 Merge branch 'master' into dynamicport 2021-09-19 17:59:09 -04:00
keronshb
6cc4e35b44 Mob lists 2021-09-19 13:28:41 -04:00
silicons
4c058114a6 Update login.dm 2021-09-12 20:37:03 -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
Lin
3b10346961 Merge pull request #15067 from timothyteakettle/fixes-synth-markings 
makes the arm/leg markings for synthetic lizards appear as an option again
 2021-09-03 13:52:15 -05:00
Putnam3145
2692f6285f Fixes a runtime in ghost update_icon 
Please make sure that no overrides have arguments when you add a new argument to a method.
 2021-09-03 01:21:21 -07:00
Timothy Teakettle
cd04aed49e Update synthliz.dm 2021-09-02 18:35:52 +01:00
zerothebigboy
dec2ea645e nuts 2021-08-26 22:57:22 -04:00
keronshb
47078e9a85 Ports Hair Gradiants 2021-08-26 11:58:09 -04:00
WanderingFox95
888c6fed15 Since apparently nobody knows what shark tails look like... 2021-08-16 13:52:24 +02:00
WanderingFox95
4a78d8a880 Separates the tails. 2021-08-15 02:21:09 +02:00
Artur
82ccfc40dc /obj/screen --> /atom/movable/screen 2021-07-29 13:57:19 +03:00
Timothy Teakettle
e9c7d61dc3 Update tails.dm 2021-07-15 19:13:56 +01: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
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
zerothebigboy
7dea33f6c2 doge 2021-05-27 16:08:28 -04: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
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
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
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
timothyteakettle
34869215e8 Merge remote-tracking branch 'upstream/master' into rp-markings-attempt-two 2021-05-14 01:59:32 +01:00
Timothy Teakettle
6095b4724f fixes fox markings legs 2021-05-10 01:54:24 +01:00
zerothebigboy
181dcc347b cum sex balls penis 2021-05-09 04:34:25 -04:00