shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
42,121 Commits 5 Branches 0 Tags
af540ba4eff2daadf855ae2e66ce3d565bf4ec97
Commit Graph

5904 Commits

Author SHA1 Message Date
silicons
af540ba4ef Merge pull request #14469 from timothyteakettle/puddles-2-electric-boogaloo 
fixes puddles breaking
 2021-03-20 14:30:10 -06:00
silicons
e433aaf881 Merge pull request #14464 from GrayRachnid/filter 
Enables the in character filter for server configuration
 2021-03-20 14:28:40 -06:00
Timothy Teakettle
71d5528959 fix 2021-03-18 21:50:03 +00:00
silicons
e0cc6e3502 Merge pull request #14391 from kiwedespars/void-but-for-real 
[HERETICS] Void & a handful of heretics-related PRS
 2021-03-18 06:38:40 -06:00
GrayRachnid
5201cf6ac5 stops racism 2021-03-17 21:58:41 -04:00
Artur
fe218150f0 Literally just adds targets to give because i forgot to do that 2021-03-16 11:48:21 +02:00
DeltaFire
79a464ca8c Merge pull request #14141 from KeRSedChaplain/clockcultrework_v2 
Clockwork cult rite additions and other edits
 2021-03-16 07:39:41 +01:00
Dan-Neposh
f96c6bc728 Merge remote-tracking branch 'origin/clockcultrework_v2' into clockcultrework_v2 2021-03-15 16:33:38 -04:00
Heretical Lizard
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
DeltaFire
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
silicons
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
silicons
9d48fba839 Merge pull request #14410 from Adelphon/hair 
new hair/sprite fix
 2021-03-12 19:35:47 -07:00
silicons
753d79be69 Update boss.dm 2021-03-11 05:54:36 -07:00
Adelphon
56cccc2ca3 new hair 2021-03-10 18:14:07 -05: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
silicons
771809a6d0 Merge branch 'master' into async_2 2021-03-09 00:17:26 -07:00
Letter N
3fa43b7f61 oops forgot this reg 2021-03-09 10:09:02 +08:00
Dan-Neposh
e29606e5f3 addresses code suggestions from Deltafire 2021-03-07 20:47:07 -05:00
Heretical Lizard
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
Heretical Lizard
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
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
silicons
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
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
silicons
1d8533c1cd Merge pull request #14324 from dzahlus/ash-drake-transform-powergaming 
Changes to ash drake transformation
 2021-03-01 18:42:28 -07:00
silicons
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
silicons
7af3c986ad Merge pull request #14328 from R3dtail/patch-3 
Makes Clownification Less Abysmal :honk:
 2021-03-01 18:32:29 -07:00
silicons
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
silicons
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
Letter N
573f86e223 Merge remote-tracking branch 'origin/master' into rustsql 2021-02-28 09:07:35 +08:00
qweq12yt
d89bc85ae7 oops forgot a "/" 
it could happen to anyone
 2021-02-27 19:26:29 -03:00
qweq12yt
6d5afe146c restores any removed quirks when unchanging 2021-02-27 19:17:12 -03:00
SandPoot
b3c2f52358 Update transform_procs.dm 2021-02-27 15:57:04 -03:00
qweq12yt
d8d2a5d4c4 using quirk susbsysten instead of trats 2021-02-27 15:56:44 -03:00
SandPoot
0952777c56 upload transform_procs.dm 2021-02-27 15:53:17 -03:00
qweq12yt
04d478bb20 turning removes pacifism 2021-02-27 01:49:56 -03:00
Letter N
59990abd25 grr 2021-02-27 08:41:54 +08:00
R3dtail
ccdfbbdc04 I'm really stupid. 
// not \\
 2021-02-26 15:33:37 -06:00
R3dtail
791ddd03d9 Tweaks anamolous crystal to prevent clown-griefing 2021-02-26 15:24:07 -06:00
silicons
9e6fb3a310 Merge pull request #14281 from kiwedespars/undo-what-has-been-done 
parrying nerf/pugilism buff
 2021-02-26 13:36:09 -07:00