shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
32,734 Commits 5 Branches 0 Tags
bcf77458dd5639ba27f07dd4acb0a174aa562dbb
Commit Graph
21280 Commits
Author SHA1 Message Date
Putnam 31f4269515 Makes miasma generate correctly, reverts previous pluox change. 2020-04-05 03:23:58 -07:00
TrilbyspacecloneandGitHub 7ed168da7f Update hivelord.dm 2020-04-05 03:05:41 -04:00
Putnam 1bf37dfb1b Doubles pluoxium specific heat 2020-04-04 22:04:37 -07:00
kevinz000andGitHub 956c2a57bf Merge pull request #11729 from Ghommie/Ghommie-cit666 
Ports the VV Refactor by Kevinz.
 2020-04-04 19:19:25 -07:00
nik707andGitHub 09c8bd40ec Merge pull request #11575 from EmeraldSundisk/coggers 
as of yet unfinished, being added in the background for ease of further development
 2020-04-04 13:18:07 -05:00
TrilbySpaceClone 15d9c9f0ae Revert "Revert "effort"" 
This reverts commit c3aaf27aa2.
 2020-04-04 11:01:21 -04:00
kevinz000andGitHub ed52038dda Merge pull request #11703 from Kraseo/public-tyranny 
Removes public mining from the game
 2020-04-04 07:39:13 -07:00
TrilbyspacecloneandGitHub 32b98cce44 rip funny commit 
//We care about you Skyrats!
 2020-04-04 10:38:11 -04:00
TrilbyspacecloneandGitHub 99bf1da408 your to you 2020-04-04 10:37:37 -04:00
Kraseo 70859170c7 basically i fucking hate map merge conflicts 2020-04-04 16:32:45 +02:00
TrilbySpaceClone c3aaf27aa2 Revert "effort" 
This reverts commit 10ca01cc95.
 2020-04-04 10:23:14 -04:00
kevinz000andGitHub 09a5e234d3 Merge pull request #11716 from kiwedespars/lightpink-nerf 
stabilized lightpink nerf - stabilized purple buff
 2020-04-04 07:22:47 -07:00
TrilbySpaceClone 62509ab4a9 the mapping side 2020-04-04 10:16:43 -04:00
kevinz000andGitHub adad236997 Merge pull request #11728 from Citadel-Station-13/Ghommie-patch-1 
What was I hoping for again?
 2020-04-04 07:16:20 -07:00
kevinz000andGitHub 2a2234483f Merge pull request #11727 from Putnam3145/vore-pacifist-fix 
Makes pacifists able to vore properly
 2020-04-04 07:15:54 -07:00
kevinz000andGitHub 5e961e5e43 Merge pull request #11711 from Arturlang/skateboards_cool_again 
Buffs skateboards
 2020-04-04 07:15:29 -07:00
kevinz000andGitHub 886f0d7500 Merge pull request #11726 from Ghommie/Ghommie-cit665 
Dwarfy message spam QoL.
 2020-04-04 07:11:02 -07:00
kevinz000andGitHub 9a0f0cab65 Merge pull request #11724 from Ghommie/Ghommie-cit664 
Stops one of the many monkey tricks with mob holders.
 2020-04-04 07:10:24 -07:00
TrilbySpaceClone 10ca01cc95 effort 2020-04-04 09:30:24 -04:00
necromanceranneandGitHub cefd212a50 I hecc'd (#11739) 2020-04-04 14:59:10 +02:00
GhomandGitHub e2d2f5a4ad Update minesweeper.dm 2020-04-04 14:04:47 +02:00
GhomandGitHub dc6eb8b6c7 Badcode Mini Nukes Fix. 2020-04-04 13:58:48 +02:00
GhomandGitHub 3c9a9136b5 Update minesweeper.dm 2020-04-04 13:46:21 +02:00
necromanceranne 38586c9d92 I feel like this is more fitting 2020-04-04 20:09:09 +11:00
necromanceranne 333a3f7c0c This was also not the right way to do this so these values may be slightly stronger overall but will mean hitting with that second punch is all the more critical. 2020-04-04 19:49:22 +11:00
TrilbyspacecloneandGitHub 31c7d70eb1 words are hard 2020-04-04 04:32:59 -04:00
necromanceranne 4c051f70e8 fixes this too 2020-04-04 19:16:59 +11:00
necromanceranne bd5446e906 NYOOPS 2020-04-04 18:21:18 +11:00
necromanceranne fcb816675b not only am I blind I am also dumb 2020-04-04 18:20:17 +11:00
necromanceranne 856eca772d this is all still super broken 2020-04-04 18:05:02 +11:00
necromanceranne 7935eb8364 pretty sure this was brekaing stuff 2020-04-04 17:24:44 +11:00
necromanceranne c6e82382a3 I feel like messing with this is basically unnecessary 2020-04-04 16:51:32 +11:00
necromanceranne 8af29a178c Hooks up the chaplain null rod gloves to the choice of gloves 2020-04-04 16:42:37 +11:00
necromanceranne 71e19aead2 ports over my krav changes from tg and also hooked in pugilist gloves to summon equipment for cultists and gave all that shit a sprite ye 2020-04-04 16:29:29 +11:00
kevinz000andGitHub 1987cc56a2 Merge pull request #11712 from Ghommie/Ghommie-cit661 
Porting the mutation conflict system, and resizing quantum realm fix.
 2020-04-03 21:58:58 -07:00
kevinz000andGitHub 010ddb2bfb Merge pull request #11706 from Ghommie/Ghommie-cit660 
Minesweeper armageddon improvements
 2020-04-03 21:55:16 -07:00
TrilbyspacecloneandGitHub 48f458cddb Update uplink_devices.dm 2020-04-04 00:09:02 -04:00
LinandGitHub e8c33c411f Merge pull request #11723 from Ghommie/Ghommie-cit663 
Fixing three runtime errors.
 2020-04-04 02:53:18 +00:00
necromanceranne 923486eb43 Merge branch 'master' into pawnch_2_the_pawnchening 2020-04-04 13:40:34 +11:00
kevinz000andGitHub 413ded02c0 Merge pull request #11433 from Ghommie/Ghommie-cit616 
Spellcasting element
 2020-04-03 16:31:10 -07:00
kevinz000andGitHub 12d78dd7d8 Merge pull request #11329 from Ghommie/Ghommie-cit601 
Made laser carbines and magrifles bulkier.
 2020-04-03 16:30:47 -07:00
kevinz000andGitHub 57fe91fafb Merge pull request #11596 from Feasel/patch-4 
[Balance Pass] - Stunbaton (Because no one wants to do a single line …
 2020-04-03 16:30:30 -07:00
Ghommie 9d97f1acda Ports the VV Refactor by Kevinz. 2020-04-03 19:16:43 +02:00
ArturlangandGitHub 598179553e Changes making cablecuffs to using cable in your hand, instead of a menu. (#11702) 
* There we go

* Ghommie suggestions
 2020-04-03 18:34:26 +02:00
GhomandGitHub a9ea7be699 Update dwarves.dm 2020-04-03 18:21:38 +02:00
GhomandGitHub 1b8b3f28c3 Update reagent_dispenser.dm 2020-04-03 18:18:12 +02:00
GhomandGitHub 150c0769ad Update reagent_dispenser.dm 2020-04-03 15:54:48 +02:00
GhomandGitHub 50ec842752 Update reagent_dispenser.dm 2020-04-03 15:53:09 +02:00
Timothy TeakettleandGitHub 0919737c21 fixes shadow emission (#11713) 2020-04-03 14:23:24 +02:00
Putnam3145GitHubGhom
 		93feb0277a Further dynamic tweaks: "you can instamerge this time" edition (#11715) 
* Starting a replacement of how threat works.

* no, we do it this way

* Added threat levels to jobs

* Added threat to... a lot.

* Updated for traitor classes.

* Fixed errors, except for one.

It's consistently giving me "maximum number of internal arrays exceeded (65535)". I have no idea what could be causing this.

* Added type annotation to GetJob.

* This one I should change though

* wow how'd that happen

* spammable means low threat

* Made story threat have initial threat level on average

* Made somet rulesets force if they won the vote

* )

* Gave EVERY job threat, added a config for it.

* Rebalanced some numbers

* Update code/game/gamemodes/dynamic/dynamic_storytellers.dm

Co-Authored-By: Ghom <42542238+Ghommie@users.noreply.github.com>

* Removes mush threat

* Makes devil threat scale with form

* reviewing reviewer's review of reviewer

* Gutlunches can be friendly spawned, so no

* Also made forced-friendly mobs not count

* null checks better

* Made antag threats in config, too

* various fixes

* Another couple dynamic fixes

* Made an admin message chunk all one line.

* Make roundstarts ignore current threat

It's not even calculated yet, so this is probably better.

* Minimum pop for chaotic/teamwork.

* More conveyance issues, removed superfluous threat costs

* More conveyance and tweaks

* Makes storyteller min players use all players instead of ready

* Lowered chaos weight with chaotic

* Blob now has correct cost

* Makes phylactery count for threat

* Makes random storyteller  have random threat level

* Made starting rulesets scale up with threat LEVEL

* Made "minor rulesets" never have lower weight

* Makes chaotic not forced.

* Made story about 25% less chaotic

Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com>
 2020-04-03 14:23:08 +02:00