Commit Graph

6250 Commits

Author SHA1 Message Date
silicons
cc6079d413 Update human_movement.dm 2020-07-17 09:10:03 -07:00
silicons
993b4ec222 Merge remote-tracking branch 'citadel/master' into unarmed_parry 2020-07-16 19:39:46 -07:00
silicons
484da28600 Merge branch 'master' into shoelaces 2020-07-16 17:31:41 -07:00
silicons
e03948dcba Merge pull request #12229 from Arturlang/TGUI-3.0
[READY]TGUI 3.0
2020-07-16 17:28:42 -07:00
Timothy Teakettle
ebd648c03d name edgecase too 2020-07-16 18:32:24 +01:00
Timothy Teakettle
a8a495c0ac rewrites pickle handling 2020-07-16 18:22:58 +01:00
Artur
9e73788714 Gah 2020-07-16 17:40:05 +03:00
BlackMajor
fc909cd7c6 Added material sheets and tiles. This took more work than you'd think. 2020-07-17 01:17:54 +12:00
Arturlang
92ed5d3201 Merge branch 'master' into TGUI-3.0 2020-07-16 15:59:37 +03:00
Artur
af65b626e3 Merge remote-tracking branch 'Upstream/master' into TGUI-3.0 2020-07-16 15:56:08 +03:00
Letter N
2afab07b4a https://github.com/tgstation/tgstation/pull/52255 2020-07-16 20:05:37 +08:00
timothyteakettle
8bfc30c8ac i can't spell 2020-07-16 02:54:31 +01:00
timothyteakettle
03bd806c73 pickle 2020-07-16 02:51:07 +01:00
Timothy Teakettle
a7e2668eff funniest 2020-07-15 23:50:39 +01:00
silicons
6121cbd091 Merge pull request #12738 from timothyteakettle/travelling-traders
the travelling trader midround event
2020-07-15 08:50:20 -07:00
BlackMajor
bd7c9d11d3 oh no 2020-07-16 02:02:29 +12:00
Artur
d0f1a805e4 Merge remote-tracking branch 'Upstream/master' into TGUI-3.0 2020-07-14 16:15:48 +03:00
silicons
c333a71c74 Update life.dm 2020-07-14 04:30:38 -07:00
Lin
55c4e40fbb Merge pull request #12706 from silicons/records
adds security/medical records to character setup
2020-07-13 11:50:02 -05:00
Artur
5f9364c5f8 Merge remote-tracking branch 'Upstream/master' into TGUI-3.0 2020-07-13 16:20:54 +03:00
Strazyplus
15470de825 Don't DragON me, mister!
Removes comments from code
Removes mentions of Navier
Why are we still here? Just to suffer?
2020-07-13 07:01:48 -04:00
Timothy Teakettle
29628dd82a cows 2020-07-12 21:40:16 +01:00
Strazyplus
92a6d673ba Drakes are dragons too 2020-07-12 07:32:09 -04:00
Strazyplus
2eb353d195 More License detail tweaks. 2020-07-12 00:56:43 -04:00
Strazyplus
582be67063 Lawyer-drake when?
unmodularized drakeborg
added licencing documentation
reduced / simpified code comments
2020-07-12 00:42:46 -04:00
Strazyplus
47921b2ae6 Removed unused sleeper_override 2020-07-11 23:16:42 -04:00
Strazyplus
c9cb29ceea Who feeding the chunkydrakes 2020-07-11 22:57:37 -04:00
Strazyplus
13fe156a8b Dragon online! 2020-07-11 21:32:34 -04:00
Timothy Teakettle
c1592ad162 more rewards 2020-07-11 23:27:29 +01:00
Lin
e87653f781 Merge pull request #12594 from Citadel-Station-13/silicons-patch-3
what if you could override the entire say verb/emphasis system to audibly emote with ! like in baycode servers
2020-07-11 16:00:39 -05:00
Lin
a75dd1d8f3 Merge pull request #12729 from Citadel-Station-13/silicons-patch-20
whooshing now happens at pressure difference * 2.5% probability instead of people hearing space wind from someone exhaling next to them
2020-07-11 15:47:03 -05:00
silicons
926f64e13d Merge pull request #12722 from kappa-sama/patch-31
lowers wisdom cow's spawnrate to standard and makes it 66% less spammy
2020-07-11 00:49:29 -07:00
silicons
08a6ef88e3 Merge pull request #12711 from LetterN/nerfs-cats
[s] Updates goonchat [ready]
2020-07-11 00:46:32 -07:00
silicons
3d80792e79 more 2020-07-11 00:37:56 -07:00
silicons
8d5d194a26 hahahahaha 2020-07-11 00:30:56 -07:00
silicons
4f4c6b85bf Merge pull request #12720 from timothyteakettle/eye-contact
port examines and eye contact
2020-07-11 00:14:47 -07:00
silicons
dc1de02b74 Update human_movement.dm 2020-07-09 23:44:17 -07:00
silicons
9c9c611285 ok 2020-07-09 23:34:35 -07:00
silicons
31da81aff4 Merge pull request #12217 from Putnam3145/putnamos-for-real
The real fastmos: C++ monstermos port
2020-07-09 20:37:18 -07:00
kappa-sama
a798061f71 also this 2020-07-09 16:14:38 -05:00
Artur
9de8483bcf Merge remote-tracking branch 'Upstream/master' into TGUI-3.0 2020-07-09 22:14:20 +03:00
Timothy Teakettle
02f46322ad port examine 2020-07-09 18:32:45 +01:00
silicons
26d384e65b fix 2020-07-09 03:17:17 -07:00
silicons
bf4936cb02 Merge pull request #12707 from Chiirno/slimebrain
Resprited brains into a new slime core sprite for jelly people.
2020-07-09 02:26:27 -07:00
Putnam
a625d6562b Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into putnamos-for-real 2020-07-08 22:02:03 -07:00
Letter N
05684e7196 no config filter thing yet, but the code for it is "ready" 2020-07-08 16:36:58 +08:00
Letter N
f757e54db9 muh immursion 2020-07-08 15:59:44 +08:00
silicons
6cbab55ef8 Merge remote-tracking branch 'citadel/master' into unarmed_parry 2020-07-07 21:07:58 -07:00
silicons
bd8cc4791f whew 2020-07-07 21:02:23 -07:00
silicons
6ee63f66aa whew 2020-07-07 20:48:54 -07:00