Timothy Teakettle
|
9de5e5f5fa
|
Update vampire.dm
|
2021-02-19 17:07:41 +00:00 |
|
zerothebigboy
|
d0beec1364
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum
# Conflicts:
# icons/mob/clothing/suit.dmi
# icons/obj/clothing/suits.dmi
|
2021-02-19 09:07:27 -05:00 |
|
shellspeed1
|
f17be50d5f
|
Revert "Fix for floorbots not placing a plate before placing a floor."
|
2021-02-18 23:28:10 -08:00 |
|
Letter N
|
6abad913ff
|
the sqel
|
2021-02-19 14:52:18 +08:00 |
|
Putnam
|
257cd6bb34
|
keyword argument funnies, whoops comma
|
2021-02-18 21:55:28 -08:00 |
|
Lin
|
1acd81c036
|
Merge pull request #14246 from TyrianTyrell/master
Multilingual conditions fix.
|
2021-02-18 23:36:20 -06: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 |
|
Letter N
|
501d33cddd
|
agony
|
2021-02-19 10:32:24 +08:00 |
|
silicons
|
2a6e70941d
|
Update alien.dm
|
2021-02-18 17:41:27 -07:00 |
|
silicons
|
ce013a5122
|
Update alien.dm
|
2021-02-18 17:34:51 -07:00 |
|
silicons
|
3ef52e039f
|
Update alien.dm
|
2021-02-18 17:29:40 -07:00 |
|
silicons
|
21ffcc0318
|
Update alien.dm
|
2021-02-18 17:27:44 -07: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 |
|
Lin
|
460042bc33
|
Merge pull request #14248 from shellspeed1/trying-to-make-floor-bots-actually-do-a-decent-job-of-repairs
Fix for floorbots not placing a plate before placing a floor.
|
2021-02-17 17:28:03 -06:00 |
|
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 |
|
zerothebigboy
|
a5de2a6620
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into ninjasarecum
# Conflicts:
# icons/mob/clothing/feet.dmi
# icons/mob/clothing/suit.dmi
# icons/obj/clothing/suits.dmi
|
2021-02-14 10:42:59 -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 |
|