shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
41,831 Commits 5 Branches 0 Tags
a478555dbdcd5fcafaa2452e9acececf7c66da56
Commit Graph

3514 Commits

Author SHA1 Message Date
Letter N
935e46b492 The Mapping Update 
Cleans up the map (again)
Makes mining code more better
 2021-03-12 12:11:35 +08:00
Letter N
de6f1401bb final fix 2021-03-08 13:24:28 +08:00
Letter N
22b33d1a6e Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-03-07 13:04:36 +08:00
Letter N
34697acf74 missing icon fix & stop throwing out parts 2021-03-05 19:29:52 +08:00
Letter N
edfe7220c4 lintfix 2021-03-05 15:45:57 +08:00
Letter N
2542fe05e9 mapmerge update + mats properly work 2021-03-05 15:38:35 +08:00
Letter N
cb346a3847 a 2021-03-05 14:29:36 +08:00
Lin
cf048e1f65 Merge pull request #14354 from Putnam3145/volume-change 
Makes ash storm volume quieter
 2021-03-04 13:32:29 -06:00
Letter N
a87e4533e5 support for tgs4 noconfigs needed*** 2021-03-03 17:33:14 +08:00
Letter N
754c24748e Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-03-03 17:09:01 +08:00
Putnam
235f916c61 Makes ash storm volume quieter. 2021-03-02 12:32:14 -08:00
Letter N
5c39381117 Merge remote-tracking branch 'origin/master' into rustsql 2021-02-23 11:36:05 +08:00
Letter N
5304029dd9 Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-23 11:01:42 +08:00
silicons
f581d8c8e0 Merge pull request #14264 from dzahlus/pain-emote-updates 
Pain emote is now added to getting wounded! As well as more pain sounds
 2021-02-21 14:56:26 -07:00
silicons
ae63422727 Merge pull request #14269 from Putnam3145/aphro-readd 
More arousal logging; adds back aphro/nympho
 2021-02-21 14:50:32 -07:00
Putnam
cbac292731 Adds back aphro, nympho 2021-02-18 21:22:43 -08:00
Letter N
7d39949a2f Merge remote-tracking branch 'origin/master' into rustsql 2021-02-19 12:38:32 +08:00
Letter N
037378eb7d Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-19 10:34:47 +08:00
SandPoot
69af7d35f8 Update remote_materials.dm 2021-02-18 15:16:40 -03:00
SandPoot
123de14009 upload files 2021-02-18 15:05:39 -03:00
SandPoot
f738023097 Revert "Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing" 
This reverts commit 2e29f30fdf, reversing
changes made to 724910cfab.
 2021-02-18 15:04:46 -03:00
SandPoot
2e29f30fdf Merge branch 'tool_behavior-replacing' of https://github.com/SandPoot/Citadel-Station-13 into tool_behavior-replacing 2021-02-18 15:04:22 -03:00
SandPoot
cf2e70671a upload files 2021-02-18 14:47:10 -03:00
dzahlus
2f6527800e monke getting wounded *pain's lmao 2021-02-18 15:55:23 +01:00
Lin
3b9f1cb4ec Merge pull request #14239 from Hatterhat/golem-gps-pass2 
well that's what i get for trusting my own code - makes golem GPSes start off, but actually this time
 2021-02-17 17:29:03 -06: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
Letter N
3f40e353aa Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-16 19:41:53 +08:00
SandPoot
4e18044450 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 + recompile tgui 2021-02-14 20:10:41 -03:00
Letter N
de67720a0a icons should exist 2021-02-14 11:39:56 +08:00
Lin
98736a7a37 Merge pull request #14207 from TyrianTyrell/master 
Multilingual fix? (Has since been tested.)
 2021-02-13 16:41:10 -06:00
Hatterhat
c5a9a8905a actually makes golem gpses start off 2021-02-13 15:20:24 -06:00
Letter N
45d6a5f87f it compiles, UNTESTED YET 2021-02-13 21:41:59 +08:00
TyrianTyrell
a4bb96f614 Update good.dm 2021-02-12 07:02:14 -05:00
Letter N
5b0a1077f4 Modular Cmp Updates 2021-02-12 18:29:00 +08:00
Letter N
a2419f760a Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-12 13:18:09 +08:00
Letter N
8a0c932d55 oops! All Refactors! 2021-02-12 11:07:58 +08:00
SandPoot
a0c92f0646 upload files 2021-02-11 13:22:37 -03:00
TyrianTyrell
5769cc106b Update good.dm 2021-02-10 13:56:56 -05:00
TyrianTyrell
e5fea58776 Update good.dm 2021-02-08 07:32:22 -05:00
Letter N
f87aa0ac5b toast. And DiscoFox™️ 2021-02-08 18:46:05 +08:00
silicons
86066450f3 Merge pull request #14179 from TyrianTyrell/master 
Signed language (Requested changes complete)
 2021-02-06 11:42:24 -07:00
TyrianTyrell
fb592b70a1 Update negative.dm 2021-02-04 15:10:12 -05:00
TyrianTyrell
44366a4a2e Currently removing phobia picking 2021-02-04 15:04:17 -05:00
silicons
993a849700 Merge pull request #14155 from SmArtKar/tgui_observe 
Port of TG's "Auto Observe"
 2021-02-04 12:49:09 -07:00
SmArtKar
7b2e1ef44f TCG! 2021-02-02 14:40:29 +03:00
TyrianTyrell
678d0c950f Update negative.dm 2021-02-01 05:48:34 -05:00
TyrianTyrell
9bda74c58d Update good.dm 2021-02-01 05:34:45 -05:00
Lin
1d275656b5 Merge pull request #14081 from Citadel-Station-13/silicons-patch-22 
makes paraplegic spawn effects yield for calling function which MIGHT fix not spawning in with a wheelchair maybe(?)
 2021-01-31 23:34:20 -06:00
Lin
0dd82df64b Merge pull request #14113 from silicons/piggybacking 
fixes piggybacking initial offsets. Also, adds the ability to carry around pAIs, because this totally won't result in more metaclique drama.
 2021-01-31 23:33:59 -06:00
SmArtKar
a7bc066891 Auto-Observe! 2021-01-28 17:09:28 +03:00