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

5929 Commits

Author SHA1 Message Date
Blue Wildrose
cd81345e9f Polishing up the new slimeperson organs also WHY IS THE SLIMEBRAIN SPRITE GONE 2021-04-07 15:00:09 -07:00
Blue Wildrose
3cf25a8cc7 Slimeperson organs are now more confusing 2021-04-06 23:10:23 -07:00
silicons
cbd7e0de6a Merge pull request #14418 from LetterN/perlin-genny 
Updates openspace & enables perlin generation on alvaland & icebox/snaxi
 2021-04-06 04:10:00 -06:00
DeltaFire
b7eac4b8bb Merge pull request #14558 from BlueWildrose/buckbumble 
Bumbles no longer has a number beside their name
 2021-04-02 19:44:23 +02:00
Blue Wildrose
f1ef779e58 Bumbles no longer has a number beside their name 2021-04-01 16:53:47 -07:00
Blue Wildrose
4de7af5db5 Bumbles no longer has a number beside their name 2021-04-01 16:31:15 -07:00
Putnam
3760be44d9 Added observe logging 2021-03-30 20:41:48 -07:00
LetterN
f976a89157 Merge remote-tracking branch 'origin/master' into perlin-genny 2021-03-31 08:19:31 +08:00
silicons
4f631c29bb Merge pull request #14504 from zeroisthebiggay/tritails 
i hate kitsune players so here i am porting triple kitsune tails from VORE fuck you
 2021-03-27 01:34:23 -06:00
silicons
ee4f019459 Merge pull request #14506 from timothyteakettle/loadout-tab-defines 
fixes character previews but does it using defines (thanks zero)
 2021-03-27 01:34:16 -06:00
Putnam
899b94f0f3 Made threat a subsystem instead of dynamic-attached. 2021-03-24 23:44:37 -07:00
LetterN
e3fb2d5491 Merge remote-tracking branch 'origin/master' into perlin-genny 2021-03-24 21:55:47 +08:00
Timothy Teakettle
14ba2b3da1 OOPS 2021-03-23 22:40:27 +00:00
Lin
79beaa97eb Merge pull request #14481 from BlueWildrose/ewwghostpuddles 
Nightmares' light eater can now destroy messes that emit light
 2021-03-23 16:33:59 -05:00
zerothebigboy
f600e51408 i hate kitsune players so i hope you appreciate me adding more cringe to your arsenal 2021-03-23 15:50:13 -04:00
Hatterhat
722b50088a message tweak 
Co-authored-by: necromanceranne <40847847+necromanceranne@users.noreply.github.com>
 2021-03-21 19:26:34 -05:00
Hatterhat
a8e4466476 sigh 2021-03-21 18:16:22 -05:00
silicons
295255e46e Merge pull request #14405 from Arturlang/vampire_death 
Makes vampries dust when they can't pay the blood cost, not before
 2021-03-20 14:31:14 -06:00
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
Blue Wildrose
c02f35a7e5 Glowing goo be gone 2021-03-20 11:29:15 -07:00
LetterN
292f67e098 Merge remote-tracking branch 'origin/master' into perlin-genny 2021-03-20 20:36:56 +08: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
Artur
6f6eedb92c tweaks vampires not to die from bloodloss 2021-03-16 06:47:39 +02: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
Letter N
935e46b492 The Mapping Update 
Cleans up the map (again)
Makes mining code more better
 2021-03-12 12:11:35 +08: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
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
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