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

18732 Commits

Author SHA1 Message Date
Hatterhat 6a7d4e32d7 i'm gonna fight blackmajor over this 2021-03-10 13:55:00 -06:00
silicons 939a493334 Merge pull request #14306 from Putnam3145/supernova 
Adds a supernova event, with tweaks to allow this
 2021-03-10 01:32:52 -07:00
silicons 03fbb256e4 Merge pull request #14371 from Sneakyrat6/matContainer 
Material container fixes
 2021-03-10 01:31:51 -07:00
silicons 0db0612e56 Merge pull request #14383 from Literallynotpickles/no-more-triple-paramedic 
Removes one paramedic slot
 2021-03-09 23:26:53 -07:00
Lin 1216a6edc5 Merge pull request #14381 from LetterN/patch-5 
fixes drone inventory deleting stuff
 2021-03-09 22:45:02 -06:00
silicons 41b75c8eb9 Merge pull request #14379 from necromanceranne/too_many_limbs 
Fixes being able to go over the defined limit of roundstart prosthetics
 2021-03-09 21:39:41 -07:00
Letter N 59a725c25a icon(s) fixes and fixes boards 2021-03-10 11:26:33 +08:00
Auris456852 8334e8c2c0 Corrects Hexacamphor 2021-03-10 00:35:00 +02:00
kiwedespars 01b026f889 trailing newlines 2021-03-09 12:53:53 -08:00
kiwedespars b868f5fc32 whoops forgot sac targets list 2021-03-09 12:49:02 -08:00
kiwedespars 3b92e33112 Merge branch 'master' into void-but-for-real 2021-03-09 12:29:50 -08:00
kiwedespars 0d696de7cd exist 
- fixes things.
- user check readded (whoops)
- knwoledge added
- nerfs madness mask
 2021-03-09 12:12:44 -08:00
silicons 57f1144b8c Update _movespeed_modifier.dm 2021-03-09 05:29:46 -07:00
kiwedespars 3ce6459aef void heretic and many other prs 2021-03-09 02:58:34 -08:00
Sneakyrat6 d5b0251cb5 Merge branch 'master' into matContainer 2021-03-09 05:42:47 -05:00
silicons 3693eb1f16 Merge pull request #14374 from SandPoot/don't-litter-please 
Makes it so you don't drop cans upon crushing them
 2021-03-09 00:20:43 -07:00
silicons 34c4887b69 Merge pull request #14351 from Putnam3145/teg-uncap 
Uncaps TEG output
 2021-03-09 00:17:47 -07:00
silicons 771809a6d0 Merge branch 'master' into async_2 2021-03-09 00:17:26 -07:00
Suicidalpickles 6496b418d4 Update paramedic.dm 2021-03-08 18:31:34 -08:00
silicons 596d0687d9 Update necropolis_gate.dm 2021-03-08 19:16:23 -07:00
Letter N 3fa43b7f61 oops forgot this reg 2021-03-09 10:09:02 +08:00
necromanceranne bdcd2904e6 Fixes going over the defined limit of roundstart prosthetics 2021-03-09 03:56:51 +11:00
Letter N de6f1401bb final fix 2021-03-08 13:24:28 +08:00
Dan-Neposh e29606e5f3 addresses code suggestions from Deltafire 2021-03-07 20:47:07 -05:00
SandPoot 80cb870311 upload drinks.dm 2021-03-07 21:39:10 -03:00
Sneakyrat6 703567e591 other fixes 2021-03-07 04:09:36 -05:00
Heretical Lizard 60b4aa58cd Update code/modules/antagonists/clockcult/clock_helpers/clock_rites.dm 
Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
 2021-03-07 02:15:19 -05:00
Heretical Lizard 55e337a9a4 Update code/modules/antagonists/clockcult/clock_helpers/clock_rites.dm 
Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
 2021-03-07 02:15:06 -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 263c7a9854 Update code/modules/antagonists/clockcult/clock_helpers/clock_rites.dm 
Co-authored-by: DeltaFire <46569814+DeltaFire15@users.noreply.github.com>
 2021-03-07 02:06:57 -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 8c3c259850 pepegasort 2021-03-07 14:11:09 +08:00
Letter N 22b33d1a6e Merge remote-tracking branch 'origin/master' into hardsync-1.5 2021-03-07 13:04:36 +08:00
silicons 87c7487344 Merge pull request #14361 from Putnam3145/hyper-nob-easier 
Makes hyper-nob, nitryl easier to make
 2021-03-06 17:00:24 -07:00
silicons 06f6a7eb46 Merge pull request #14360 from Hatterhat/pipegun 
pipe shotgun reskins
 2021-03-06 17:00:15 -07:00
silicons 4fdaf10049 Merge pull request #14359 from Hatterhat/traumannounce 
funny trauma announce
 2021-03-06 17:00:10 -07:00
silicons 21905f45f3 Merge pull request #14353 from dzahlus/small-big-iron-on-his-hip-in-his-pocket 
MWS-01 Changes
 2021-03-06 16:59:46 -07:00
Letter N 4482453067 dihydrogen 2021-03-06 19:56:19 +08:00
Letter N 4463fd9513 paperwork mini update, also ASS_BLAST_USA 2021-03-06 19:28:29 +08:00
Letter N 709aaa5006 NEW() moment 2021-03-06 13:28:57 +08:00
Letter N e84257e624 fix surgery cb, linter 2021-03-06 11:22:01 +08:00
Letter N a43309a097 shuttle pog 2021-03-05 22:26:55 +08:00
Letter N 34697acf74 missing icon fix & stop throwing out parts 2021-03-05 19:29:52 +08:00
Letter N 4f8d6c7c11 bruh 2021-03-05 17:21:22 +08:00
Letter N e967590dfa fix verb 2021-03-05 17:17:30 +08:00
Letter N cb346a3847 a 2021-03-05 14:29:36 +08:00
Dan-Neposh ca2f302d69 Rewords Nar'Sies death annoucement 2021-03-04 10:51:44 -05:00
Letter N f2f97f5855 ae 2021-03-04 22:01:46 +08:00
Dan-Neposh d9d3468ce0 Fixes Ratvars linters 2021-03-04 08:05:44 -05:00
Letter N 5897cfd97b when tgui 
subscript text
 2021-03-04 16:39:44 +08:00