 DeltaFireandGitHub
|
79a464ca8c
|
Merge pull request #14141 from KeRSedChaplain/clockcultrework_v2
Clockwork cult rite additions and other edits
|
2021-03-16 07:39:41 +01:00 |
|
|
Artur
|
6f6eedb92c
|
tweaks vampires not to die from bloodloss
|
2021-03-16 06:47:39 +02:00 |
|
|
silicons
|
5d51025ad6
|
Merge remote-tracking branch 'citadel/master' into combat_v7
|
2021-03-15 14:39:16 -07:00 |
|
|
Dan-Neposh
|
f96c6bc728
|
Merge remote-tracking branch 'origin/clockcultrework_v2' into clockcultrework_v2
|
2021-03-15 16:33:38 -04:00 |
|
|
|
791d8f133d
|
Update code/modules/mob/living/living_defense.dm
Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
|
2021-03-15 16:43:23 -04:00 |
|
|
Dan-Neposh
|
39c9da93c9
|
deletes an unneeded space
|
2021-03-15 16:17:44 -04:00 |
|
|
DeltaFireandGitHub
|
be41ead215
|
Merge pull request #14319 from silicons/async_2
enforces SHOULD_NOT_SLEEP on Life(), fixes some more process() sleeps that might be causing controller lockups
|
2021-03-15 17:01:42 +01:00 |
|
|
siliconsandGitHub
|
5472186bc2
|
Merge pull request #14398 from LetterN/post-hardsync1.5
post-hardsync1.5
|
2021-03-14 23:30:26 -06:00 |
|
|
kiwedespars
|
8f1715704d
|
Merge branch 'master' into void-but-for-real
|
2021-03-12 23:58:49 -08:00 |
|
|
kiwedespars
|
69d927e756
|
Merge branch 'master' into void-but-for-real
|
2021-03-12 23:10:19 -08:00 |
|
|
siliconsandGitHub
|
9d48fba839
|
Merge pull request #14410 from Adelphon/hair
new hair/sprite fix
|
2021-03-12 19:35:47 -07:00 |
|
|
Letter N
|
935e46b492
|
The Mapping Update
Cleans up the map (again)
Makes mining code more better
|
2021-03-12 12:11:35 +08:00 |
|
|
siliconsandGitHub
|
753d79be69
|
Update boss.dm
|
2021-03-11 05:54:36 -07:00 |
|
|
Adelphon
|
56cccc2ca3
|
new hair
|
2021-03-10 18:14:07 -05:00 |
|
|
Artur
|
afee437890
|
Fixes statpanel spans too
|
2021-03-10 23:18:45 +02:00 |
|
|
Artur
|
0f9754840c
|
wrong way, whoops
|
2021-03-10 23:04:16 +02:00 |
|
|
Artur
|
d646b7535c
|
Makes vampries dust when they can't pay the blood cost, not before
|
2021-03-10 22:31:53 +02:00 |
|
|
Letter N
|
59a725c25a
|
icon(s) fixes and fixes boards
|
2021-03-10 11:26:33 +08:00 |
|
|
kiwedespars
|
01b026f889
|
trailing newlines
|
2021-03-09 12:53:53 -08:00 |
|
|
kiwedespars
|
3b92e33112
|
Merge branch 'master' into void-but-for-real
|
2021-03-09 12:29:50 -08:00 |
|
|
kiwedespars
|
3ce6459aef
|
void heretic and many other prs
|
2021-03-09 02:58:34 -08:00 |
|
|
siliconsandGitHub
|
771809a6d0
|
Merge branch 'master' into async_2
|
2021-03-09 00:17:26 -07:00 |
|
|
Letter NandGitHub
|
3fa43b7f61
|
oops forgot this reg
|
2021-03-09 10:09:02 +08:00 |
|
|
Putnam
|
cc360288bd
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos
|
2021-03-08 14:46:46 -08:00 |
|
|
Dan-Neposh
|
e29606e5f3
|
addresses code suggestions from Deltafire
|
2021-03-07 20:47:07 -05:00 |
|
|
|
63d21d151c
|
Update code/modules/mob/living/living_defense.dm
Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
|
2021-03-07 02:13:03 -05:00 |
|
|
|
9787c02258
|
Update code/modules/mob/living/living_defense.dm
Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
|
2021-03-07 02:06:18 -05:00 |
|
|
silicons
|
5d1cda26dc
|
changes
|
2021-03-06 18:15:37 -07:00 |
|
|
silicons
|
cf7d428ac6
|
changes
|
2021-03-06 18:11:40 -07:00 |
|
|
silicons
|
c6ba7bfe1f
|
changes
|
2021-03-06 18:06:53 -07:00 |
|
|
Letter N
|
4463fd9513
|
paperwork mini update, also ASS_BLAST_USA
|
2021-03-06 19:28:29 +08:00 |
|
|
Letter N
|
754c24748e
|
Merge remote-tracking branch 'origin/master' into hardsync-1.5
|
2021-03-03 17:09:01 +08:00 |
|
|
siliconsandGitHub
|
8989394742
|
Merge pull request #14270 from LetterN/rustsql
Removes bsql 2
|
2021-03-03 00:53:46 -07:00 |
|
|
Letter N
|
889802a376
|
a
|
2021-03-03 14:16:36 +08:00 |
|
|
Letter N
|
4b62633fd8
|
a
|
2021-03-03 14:11:38 +08:00 |
|
|
Putnam
|
f07a9c13fb
|
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into auxtools-atmos
|
2021-03-02 01:44:58 -08:00 |
|
|
Letter N
|
6514f4034c
|
a
|
2021-03-02 12:57:26 +08:00 |
|
|
Letter N
|
364381937f
|
fix+disallows admins rigging votes
|
2021-03-02 10:18:30 +08:00 |
|
|
siliconsandGitHub
|
1d8533c1cd
|
Merge pull request #14324 from dzahlus/ash-drake-transform-powergaming
Changes to ash drake transformation
|
2021-03-01 18:42:28 -07:00 |
|
|
siliconsandGitHub
|
b5bb90ecf8
|
Merge pull request #14290 from SandPoot/properlegioninheritance
Legions pass their type to the mob they infect
|
2021-03-01 18:35:37 -07:00 |
|
|
siliconsandGitHub
|
7af3c986ad
|
Merge pull request #14328 from R3dtail/patch-3
Makes Clownification Less Abysmal :honk:
|
2021-03-01 18:32:29 -07:00 |
|
|
siliconsandGitHub
|
c23db5daee
|
Merge pull request #14327 from qweq12yt/pacifist-zombo-fix
fixes pacifist zombies
|
2021-03-01 18:26:16 -07:00 |
|
|
Letter N
|
09ce499146
|
aeiou
|
2021-03-01 21:55:34 +08:00 |
|
|
siliconsandGitHub
|
25a9f80c36
|
Merge pull request #14334 from SandPoot/this-proc-can't-be-split
Cannot modify null.real_name
|
2021-02-28 22:49:30 -07:00 |
|
|
silicons
|
0f16178425
|
changes
|
2021-02-28 02:43:32 -07:00 |
|
|
silicons
|
5d37871cd2
|
changes
|
2021-02-28 00:47:24 -07:00 |
|
|
silicons
|
519c694252
|
removes combat mode effects
|
2021-02-28 00:44:56 -07:00 |
|
|
silicons
|
8fc1dc9c29
|
changes
|
2021-02-28 00:40:04 -07:00 |
|
|
silicons
|
e43838739d
|
changes
|
2021-02-28 00:37:39 -07:00 |
|
|
silicons
|
70c828f74d
|
changes
|
2021-02-28 00:27:14 -07:00 |
|