 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 |
|
|
SandPoot
|
eb4fcd8a00
|
for some reason A doesn't have istype? what.
|
2021-02-22 13:51:49 -03:00 |
|
|
SandPoot
|
19efaba061
|
upload hivelord.dm
|
2021-02-22 13:37:49 -03:00 |
|
|
SandPoot
|
d9e966234a
|
upload hivelord.dm
|
2021-02-22 13:36:06 -03: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 |
|
|
silicons
|
841bb2aac2
|
Merge pull request #14265 from SandPoot/tool_behavior-replacing
Tool behavior replacing
|
2021-02-21 14:48:50 -07:00 |
|
|
Hatterhat
|
1eb2d3dd93
|
buhhh lingfist nerf
|
2021-02-21 02:58:19 -06:00 |
|
|
Letter N
|
7c0a63f729
|
Merge remote-tracking branch 'origin/master' into hardsync-1.5
|
2021-02-21 09:57:22 +08:00 |
|
|
Letter N
|
0bb5ec3316
|
Merge remote-tracking branch 'origin/master' into rustsql
|
2021-02-21 09:55:36 +08:00 |
|
|
kiwedespars
|
6a694841aa
|
i forgot this thing
microstagger is now a stagger
|
2021-02-20 17:46:06 -08:00 |
|
|
kiwedespars
|
15a8d1d5e0
|
i did a thing
- reverted salt nerf
- made it so you can't parry while resting
|
2021-02-20 17:24:30 -08:00 |
|
|
silicons
|
e36794d0f5
|
Merge pull request #14271 from shellspeed1/revert-14248-trying-to-make-floor-bots-actually-do-a-decent-job-of-repairs
Revert "Fix for floorbots not placing a plate before placing a floor."
|
2021-02-20 02:59:16 -07:00 |
|
|
silicons
|
cabc471d92
|
Merge pull request #14273 from timothyteakettle/chaplain-vampire
chaplain vampires won't burn in their own chapel now
|
2021-02-20 02:58:06 -07:00 |
|
|
Timothy Teakettle
|
9528cc9ce4
|
woops i left that in
|
2021-02-19 19:36:19 +00:00 |
|
|
Timothy Teakettle
|
94ad05b2bc
|
better idea
|
2021-02-19 17:14:36 +00:00 |
|
|
Timothy Teakettle
|
9de5e5f5fa
|
Update vampire.dm
|
2021-02-19 17:07:41 +00: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 |
|
|
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 |
|
|
TyrianTyrell
|
6703bd7205
|
Update say.dm
|
2021-02-14 06:35:55 -05:00 |
|