shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
46,360 Commits 5 Branches 0 Tags
f4dca7caa671395b033aa2a2484cac7ca0281dfb
Commit Graph

366 Commits

Author SHA1 Message Date
SandPoot
da1f58f297 Update files 2022-05-19 13:23:17 -03:00
silicons
73d39db3c1 Merge pull request #15343 from SandPoot/deadmin-prefs 
Ports Automatic Deadminning from TG
 2022-04-15 17:44:55 -07:00
SandPoot
64d18a3050 Update preferences_savefile.dm 2022-04-08 21:09:29 -03:00
BlueWildrose
3687361ba5 Butts, nuts, n' tats. (please testmerge or merge & deploy before Halloween ball) (#15304) 
* Butts

* testicle fix + hidden is back

* updated booba

* prob bad idea actually thinking about icon states

* fuck

* this should be everything now

* SandPoot's suggestion

Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>

* tguify that last option

* Revert "tguify that last option"

This reverts commit f9d7a075e997e3d9c0a4f641db43343796cecb98.

* Revert "Merge branch 'master' into cursingcitadel"

This reverts commit 2998b1908a74b381857056f5ce6b34894d950c06, reversing
changes made to 6fc65a28fa4f6012c70675b4cbc0299d7740912a.

* Revert "Revert "Merge branch 'master' into cursingcitadel""

This reverts commit c4a2ad1a630b6376801df3e1cec88aad3d2935ea.

Co-authored-by: SandPoot <43283559+SandPoot@users.noreply.github.com>
Co-authored-by: Putnam3145 <putnam3145@gmail.com>
 2022-03-30 20:06:00 -07:00
SandPoot
e9637bb688 Merge branch 'master' into deadmin-prefs 2022-03-22 15:35:46 -03:00
SandPoot
45a49c6106 Upload files 2022-03-05 13:49:26 -03: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
LetterN
18b7069f1f Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch 2022-01-11 09:49:38 +08:00
SandPoot
8510dcc08a Ports tgui stripping (finally) (#15401) 
* Upload files

* Update items.dm

* Update files

* Update files

* Update strippable.dm

* Update strippable

* Update strippable.dm

* Upload files

* Update files

* Update files

* Update files

* update files

* Update files

* Update dog.dm

* Update strippable.dm

* Update equipping

* Update strippable.d

* Upload files

* Upload files

* Update monkey.dm
 2021-12-30 07:40:15 +01:00
LetterN
eb98848a9f wires this code to the PROPER prefs 2021-11-14 09:23:08 +08:00
LetterN
8b16653744 Merge remote-tracking branch 'origin/master' into what-should-i-name-this-branch 2021-11-12 08:50:23 +08:00
LetterN
9a24f89780 THE fix 2021-11-10 10:33:15 +08:00
SandPoot
80dce37eb4 Upload files 2021-11-06 15:38:13 -03:00
silicons
186b552103 merge 2021-10-29 21:50:58 -07:00
silicons
ead04910c2 Update preferences_savefile.dm (#15108) 2021-09-09 18:23:01 +02: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
b2ef076043 Upload files 2021-08-26 16:44:36 -03:00
keronshb
7070a848b6 Item Highlight Port 2021-08-22 00:21:06 -04:00
SandPoot
3cb44d41a3 upload files 2021-07-14 00:35:30 -03:00
Timothy Teakettle
022003dc7c funny comment 2021-05-08 02:05:20 +01:00
Timothy Teakettle
42d8d83ca2 Update preferences_savefile.dm 2021-05-08 01:52:55 +01:00
Timothy Teakettle
149cdeb9fd Update preferences_savefile.dm 2021-05-08 01:34:43 +01:00
Timothy Teakettle
5e271c239f conflict resolving caused runtimes 2021-05-08 01:31:44 +01:00
Timothy Teakettle
5bc33c222a Merge remote-tracking branch 'upstream/master' into rp-markings-attempt-two 2021-05-08 01:28:23 +01:00
Timothy Teakettle
108ff3d2f4 Merge branch 'rp-markings-attempt-two' of https://github.com/timothyteakettle/Citadel-Station-13 into rp-markings-attempt-two 2021-05-08 01:27:22 +01:00
timothyteakettle
0fb72497ff color fix 2021-05-07 16:46:40 +01:00
timothyteakettle
bef9473fa1 more migration fixes and general bugfixes 2021-05-07 16:10:20 +01:00
timothyteakettle
3b07164fb4 Update preferences_savefile.dm 2021-05-07 00:56:27 +01:00
timothyteakettle
f5e2d3de2c Update preferences_savefile.dm 2021-05-07 00:44:44 +01:00
timothyteakettle
eab47bb6ae Update preferences_savefile.dm 2021-05-07 00:43:33 +01:00
timothyteakettle
440a6633ea Update preferences_savefile.dm 2021-05-07 00:37:33 +01:00
timothyteakettle
e95e4ed106 Update preferences_savefile.dm 2021-05-06 23:39:41 +01:00
Timothy Teakettle
a269e8bf03 migration fix 2021-05-06 01:51:17 +01:00
Timothy Teakettle
3c7137f951 what if we didnt break 90% of the game 2021-05-05 18:19:02 +01:00
Timothy Teakettle
ba71bb944a im not crazy but this commit breaks 90% of the game 2021-05-05 18:11:05 +01:00
Timothy Teakettle
93254f5d9c Merge remote-tracking branch 'upstream/master' into rp-markings-attempt-two 2021-05-02 22:20:57 +01:00
Timothy Teakettle
d32770a0fa test 2021-05-02 22:19:41 +01:00
Timothy Teakettle
ac504d679b digi humans 2021-04-30 14:07:44 +01:00
SandPoot
5bb6078def upload files 2021-04-22 20:39:21 -03:00
silicons
77178c7664 Fix 2021-03-20 12:14:38 -07:00
silicons
d9a2316825 fix 2021-03-20 12:13:28 -07:00
silicons
bff668b743 why 2021-03-18 21:53:53 -07:00
Timothy Teakettle
9c3f7cbad6 no 2021-03-01 21:05:32 +00:00
Timothy Teakettle
329e8e7d38 Merge branch 'master' into language-tab 2021-03-01 20:49:16 +00:00
SmArtKar
b2b7b4ca9a Fucking finally 2021-02-18 14:17:43 +03:00
silicons
e009b9ef5f Merge pull request #14186 from SmArtKar/trading_card_game 
[READY][PORT] Codename: Blue Eyes White Jumpsuit, the Citadel TCG. Part 1
 2021-02-17 01:30:13 -07:00
Timothy Teakettle
d858c420aa Update preferences_savefile.dm 2021-02-10 23:18:53 +00:00
TyrianTyrell
d1b7b191d2 Update preferences_savefile.dm 2021-02-04 15:14:20 -05:00
SmArtKar
b0c63ea547 Fuck you and your persistence system 2021-02-03 16:43:05 +03:00
TyrianTyrell
c8f797d69c Update preferences_savefile.dm 2021-02-01 05:45:14 -05:00