Commit Graph

4899 Commits

Author SHA1 Message Date
timothyteakettle
a607130e3c please compile 2020-07-22 16:24:35 +01:00
timothyteakettle
ed1e8c4221 support for masks 2020-07-22 15:43:58 +01:00
timothyteakettle
6a4264085c woops 2: electric boogaloo 2020-07-22 00:17:03 +01:00
timothyteakettle
0706ac9d2a woops 2020-07-22 00:14:26 +01:00
timothyteakettle
6891bff9d3 further emotes 2020-07-22 00:07:15 +01:00
Timothy Teakettle
5c88253f93 lots more hats 2020-07-21 22:58:13 +01:00
Timothy Teakettle
0942b46796 more fashions 2020-07-21 18:43:58 +01:00
timothyteakettle
8e2c76db7c two more 2020-07-21 16:42:59 +01:00
timothyteakettle
99a2068dd2 its cool and hip 2020-07-21 16:26:51 +01:00
timothyteakettle
4daf71d99e woo it works 2020-07-21 03:34:50 +01:00
timothyteakettle
47ff13c539 apply the overlay 2020-07-21 02:37:21 +01:00
timothyteakettle
1ed035e4a3 move 2020-07-21 02:29:41 +01:00
timothyteakettle
3e0403a7e9 BEEPSKY FASHION 2020-07-21 02:22:42 +01:00
BlackMajor
f265b85d3b Merge pull request #12810 from lolman360/master
service borg fix/tweak
2020-07-20 11:42:59 +12:00
Lin
ba3dc6a73b Merge pull request #12679 from silicons/unarmed_parry
Ok ok hear me out: Implements unarmed parry.
2020-07-18 17:02:02 -05:00
Lin
e165524763 Merge pull request #12803 from Citadel-Station-13/silicons-patch-32
removes tango dancing
2020-07-18 11:17:42 -05:00
lolman360
55ed77a89d Update robot_modules.dm 2020-07-18 16:15:47 +10:00
lolman360
f84b044f34 Update robot_modules.dm 2020-07-18 16:05:57 +10:00
silicons
655afda020 Merge pull request #12780 from BlackMajor/borgo
Even more engiborg power creep
2020-07-17 17:08:23 -07:00
silicons
a2c3643e20 fix 2020-07-17 12:46:32 -07:00
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
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
Timothy Teakettle
29628dd82a cows 2020-07-12 21:40:16 +01: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
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
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