Commit Graph

27601 Commits

Author SHA1 Message Date
Putnam 5f6d478509 Added a "desired mode chaos" system 2021-03-07 20:14:11 -08:00
Sneakyrat6 0db08088c4 Fixes material insertion animations not working when there is no silo 2021-03-07 22:43:55 -05:00
Putnam a651b629c9 Allows repeated mode adjust to be >100 total 2021-03-07 19:28:50 -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 395bdaf5f9 removes code i commented out 2021-03-07 04:13:18 -05: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 2de08b7bae lateinit mayhaps? 2021-03-06 20:01:14 +08: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
Sneakyrat6 f875218284 Fixes material component 2021-03-06 03:48:52 -05: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
DeltaFire 357853863e Merge pull request #14352 from timothyteakettle/jar-nerf
exiting a bluespace jar through any means, hardstuns you for 5 seconds
2021-03-06 03:50:35 +01:00
DeltaFire 483790889c Merge pull request #14312 from Citadel-Station-13/silicons-patch-20
makes codebase compile on 514 (wow one line)
2021-03-06 03:41:59 +01:00
Letter N a43309a097 shuttle pog 2021-03-05 22:26:55 +08:00
Letter N c624c3ae14 economical inflation 2021-03-05 20:00:45 +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 edfe7220c4 lintfix 2021-03-05 15:45:57 +08:00
Letter N 2542fe05e9 mapmerge update + mats properly work 2021-03-05 15:38:35 +08:00
Letter N cb346a3847 a 2021-03-05 14:29:36 +08:00
Lin cf048e1f65 Merge pull request #14354 from Putnam3145/volume-change
Makes ash storm volume quieter
2021-03-04 13:32:29 -06:00
Putnam3145 43d66e90b7 Merge pull request #14356 from keronshb/RPlasmaTweak
Removes Superconuctivity from Reinforced Plasma Glass
2021-03-04 09:33:45 -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
Letter N dcab40cdb6 building pipeline 2021-03-04 21:51:20 +08:00
Dan-Neposh d9d3468ce0 Fixes Ratvars linters 2021-03-04 08:05:44 -05:00
Letter N 23c04cac12 wait it's still free 2021-03-04 16:46:00 +08:00
Letter N 45278c02a2 send it 2021-03-04 16:41:42 +08:00
Letter N 5897cfd97b when tgui
subscript text
2021-03-04 16:39:44 +08:00
Letter N 7e427aa8e6 HOTFIX AEIOU 2021-03-04 16:20:44 +08:00
Dan-Neposh b2f80555bb hopefully fixes run linters, as well as rewords some announcements 2021-03-04 01:58:36 -05:00
Putnam 2137818d76 Massively reduced max-size minesweeper 2021-03-03 18:42:35 -08:00
Letter N ea4cb2c14d stop spamming text pls 2021-03-04 10:26:41 +08:00
Putnam 5b771d57ed also makes nitryl not generate oxygen/nitrogen 2021-03-03 17:43:18 -08:00
Putnam 414e42093c Reaction rebalancing 2021-03-03 17:37:00 -08:00
Letter N a87e4533e5 support for tgs4 noconfigs needed*** 2021-03-03 17:33:14 +08:00