Commit Graph

5968 Commits

Author SHA1 Message Date
Dan-Neposh
2ec2f55eb7 updates fork 2021-02-17 12:03:28 -05:00
shellspeed1
303d35074d Another fix for infinite floor tiles 2021-02-16 20:24:50 -08:00
Letter N
3f40e353aa Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-16 19:41:53 +08:00
TyrianTyrell
6f25b65290 Apply suggestions from code review
Let's see if it will?

Co-authored-by: Lin <linzolle@gmail.com>
2021-02-16 03:24:27 -05:00
silicons
3cac44b2f0 a 2021-02-15 19:35:16 -07:00
Lin
975c98731e Merge pull request #14242 from timothyteakettle/age-gate-2-electric-boogaloo
age gate 2 electric boogaloo
2021-02-15 18:16:44 -06:00
TyrianTyrell
915b911a40 Update say.dm 2021-02-15 17:15:30 -05:00
Lin
142be853dc Merge pull request #14245 from silicons/sprint_staging
adds config entry for sprint removal that works prettier than just setting sprint speed to 0
2021-02-14 22:52:44 -06:00
shellspeed1
3222703917 makes floor bots place a plate before a tile 2021-02-14 16:42:59 -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
TyrianTyrell
58469ea2a1 Update say.dm 2021-02-14 11:53:44 -05:00
TyrianTyrell
f1d9f288cb Update say.dm 2021-02-14 11:47:26 -05:00
TyrianTyrell
a889f41a86 Update say.dm 2021-02-14 11:41:29 -05:00
TyrianTyrell
15d1146531 Update say.dm 2021-02-14 11:33:41 -05:00
TyrianTyrell
11bae949e5 Update say.dm 2021-02-14 11:32:36 -05:00
TyrianTyrell
95c9e8b94c Update say.dm 2021-02-14 11:24:19 -05:00
TyrianTyrell
4650c97c61 Update say.dm 2021-02-14 11:23:43 -05:00
TyrianTyrell
6703bd7205 Update say.dm 2021-02-14 06:35:55 -05:00
TyrianTyrell
7a7c15f266 Update say.dm 2021-02-14 06:11:09 -05:00
TyrianTyrell
1c552480d8 Update say.dm 2021-02-14 06:10:10 -05:00
TyrianTyrell
e9e82cedc2 Update say.dm 2021-02-14 06:07:30 -05:00
TyrianTyrell
6c76e584f8 Update say.dm 2021-02-14 06:02:21 -05:00
TyrianTyrell
72ae19e036 Update say.dm 2021-02-14 06:00:26 -05:00
TyrianTyrell
f49deabe0f Update say.dm 2021-02-14 05:58:41 -05:00
TyrianTyrell
6c6cad632b Update say.dm 2021-02-14 05:53:21 -05:00
TyrianTyrell
b40d875d11 Update say.dm 2021-02-14 05:52:16 -05:00
Lin
62fe42513b Merge pull request #14096 from Citadel-Station-13/silicons-patch-27
makes people on the ground punch less hard. completely removes punch rng miss.
2021-02-13 23:30:00 -06:00
silicons
43174501de final tweaks 2021-02-13 20:47:38 -07:00
silicons
2ef33c5c88 sprint updates 2021-02-13 20:24:26 -07:00
timothyteakettle
b2588c5d57 Update new_player.dm 2021-02-14 02:11:07 +00:00
silicons
aeb9b1e06c Merge pull request #14233 from DeltaFire15/armwrap-kneecap
About unarmed parrying..
2021-02-13 19:06:39 -07:00
Letter N
45d6a5f87f it compiles, UNTESTED YET 2021-02-13 21:41:59 +08:00
silicons
731c368ba7 Merge pull request #14231 from DeltaFire15/sigh
sigh
2021-02-12 19:00:14 -07:00
Letter N
5db87b9065 more updates! 2021-02-12 17:52:59 +08:00
Letter N
a2419f760a Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-02-12 13:18:09 +08:00
DeltaFire
1ea3aafa10 Merge pull request #14166 from Hatterhat/ebola-nerf
energy bola nerf - reduced breakout time (6 sec -> 2.5), deletes on remove
2021-02-12 05:06:48 +01:00
DeltaFire
06101ee9c8 sigh 2021-02-12 03:30:15 +01:00
DeltaFire
5afa573fa6 sigh
sigh
2021-02-12 00:50:42 +01:00
SandPoot
a0c92f0646 upload files 2021-02-11 13:22:37 -03:00
Letter N
834e4730b3 not existing 2021-02-09 15:44:49 +08:00
Timothy Teakettle
e433c0b172 Update living.dm 2021-02-08 17:04:55 +00:00
Timothy Teakettle
3d97c1fb89 log fix 2021-02-08 17:00:26 +00:00
Timothy Teakettle
b7e9169257 Update human.dm 2021-02-08 16:44:02 +00: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
Lin
fe263ae2ff Merge pull request #13890 from silicons/parry
ablative parry armwraps
2021-02-05 23:52:18 -06:00
raspy-on-osu
a7dd74201c 2 2021-02-04 16:51:06 -05:00
raspy-on-osu
3a3b3966a1 Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ventcrawling-refactor-fix2 2021-02-04 16:46:37 -05:00
silicons
055b1a1db8 Merge pull request #14183 from timothyteakettle/by-armok-by-beard
dwarf facial hair is no longer randomised
2021-02-04 12:56:01 -07: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