8379169b81
Merge pull request #11476 from kevinz000/shield_refactor
...
Completely overhauls how blocking, shields, reflecting, and anything in between is handled. Has some small gameplay effects.
2020-04-07 20:47:15 +00:00
395d33e54c
Merge pull request #11766 from Ghommie/Ghommie-cit699
...
Bringing back accidentally reverted solar panel fixes.
2020-04-07 19:59:48 +00:00
8b2132317b
Ports a rewritten version of BAYSTRUMENTS ( #11680 )
...
* bay instruments
* k
* AAA
* remove that
* changes
* Update _instrument_key.dm
* safety nets
* @ghommie fixed
* volume
* Update item.dm
* Update item.dm
Co-authored-by: Ghom <42542238+Ghommie@users.noreply.github.com >
2020-04-07 15:21:50 +02:00
dad6ddb042
Merge pull request #11764 from Ghommie/Ghommie-cit668
...
Fixing spellcasting and edge cases.
2020-04-07 02:50:24 -07:00
536934d1e2
Merge pull request #11770 from Kraseo/i-hate-slimes
...
The contractor pod now gives regen jelly instead of omnizine
2020-04-07 02:43:33 -07:00
029f8ff698
Merge pull request #11763 from necromanceranne/popcap_time
...
Pop caps Sleeping Carp and Rising Bass to 30 players.
2020-04-07 01:58:14 -07:00
f88d36addf
quirky ass slime roundstart races
2020-04-07 01:12:21 +02:00
ef0b81eabf
Merge pull request #11744 from Citadel-Station-13/Ghommie-patch-4
...
Fixed the epic nuke exploit
2020-04-06 15:48:02 -07:00
d89170e441
Merge pull request #11748 from Trilbyspaceclone/patch-334
...
Infested plasmamen now are miner type
2020-04-06 15:47:00 -07:00
699f891166
Merge pull request #11750 from Putnam3145/pluoxium
...
Makes miasma actually properly incorporate with air instead of using hacky spec heat stuff
2020-04-06 15:46:09 -07:00
f6db5764e3
Bringing back accidentally reverted solar panel fixes.
2020-04-06 18:20:34 +02:00
faf199fc35
Corrects Plasmamen sec jumpsuits not starting with MAXIUM tracking ( #11747 )
...
* Update security.dm
* Update civilian_service.dm
* why is their so many more lines of the same code here?
* Update rnd.dm
* clears up sec file so that they all use a base
* Update curator.dm
2020-04-06 17:53:43 +02:00
b92da66f04
Fixing spellcasting and edge cases.
2020-04-06 17:32:51 +02:00
eece94caf3
puts a pop cap on the various martial arts.
2020-04-07 00:28:09 +10:00
33fc3ce1e0
Update spell.dm
2020-04-06 07:05:33 +02:00
5108bf1fc3
Stuff about power ( #11664 )
...
* Overhauled how APCs work, I guess
* Makes cells drain like before
2020-04-06 04:26:14 +02:00
31f4269515
Makes miasma generate correctly, reverts previous pluox change.
2020-04-05 03:23:58 -07:00
7ed168da7f
Update hivelord.dm
2020-04-05 03:05:41 -04:00
1bf37dfb1b
Doubles pluoxium specific heat
2020-04-04 22:04:37 -07:00
956c2a57bf
Merge pull request #11729 from Ghommie/Ghommie-cit666
...
Ports the VV Refactor by Kevinz.
2020-04-04 19:19:25 -07:00
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
ed52038dda
Merge pull request #11703 from Kraseo/public-tyranny
...
Removes public mining from the game
2020-04-04 07:39:13 -07:00
70859170c7
basically i fucking hate map merge conflicts
2020-04-04 16:32:45 +02:00
09a5e234d3
Merge pull request #11716 from kiwedespars/lightpink-nerf
...
stabilized lightpink nerf - stabilized purple buff
2020-04-04 07:22:47 -07:00
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
2a2234483f
Merge pull request #11727 from Putnam3145/vore-pacifist-fix
...
Makes pacifists able to vore properly
2020-04-04 07:15:54 -07:00
5e961e5e43
Merge pull request #11711 from Arturlang/skateboards_cool_again
...
Buffs skateboards
2020-04-04 07:15:29 -07:00
886f0d7500
Merge pull request #11726 from Ghommie/Ghommie-cit665
...
Dwarfy message spam QoL.
2020-04-04 07:11:02 -07:00
dc6eb8b6c7
Badcode Mini Nukes Fix.
2020-04-04 13:58:48 +02:00
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
010ddb2bfb
Merge pull request #11706 from Ghommie/Ghommie-cit660
...
Minesweeper armageddon improvements
2020-04-03 21:55:16 -07:00
e8c33c411f
Merge pull request #11723 from Ghommie/Ghommie-cit663
...
Fixing three runtime errors.
2020-04-04 02:53:18 +00:00
413ded02c0
Merge pull request #11433 from Ghommie/Ghommie-cit616
...
Spellcasting element
2020-04-03 16:31:10 -07:00
12d78dd7d8
Merge pull request #11329 from Ghommie/Ghommie-cit601
...
Made laser carbines and magrifles bulkier.
2020-04-03 16:30:47 -07:00
9d97f1acda
Ports the VV Refactor by Kevinz.
2020-04-03 19:16:43 +02:00
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
a9ea7be699
Update dwarves.dm
2020-04-03 18:21:38 +02:00
1b8b3f28c3
Update reagent_dispenser.dm
2020-04-03 18:18:12 +02:00
150c0769ad
Update reagent_dispenser.dm
2020-04-03 15:54:48 +02:00
50ec842752
Update reagent_dispenser.dm
2020-04-03 15:53:09 +02:00
0919737c21
fixes shadow emission ( #11713 )
2020-04-03 14:23:24 +02:00
c5b55826b5
Punches land with the same consistency across races, punches cheaper, king hits are nastier ( #11707 )
...
* I think everyone should be landing punches now.
* brawling just got mathematical?
* pawnch harder get tired less this is a balance change now I guess
* nearly added instastun king hits, now stun punches are more rng
* I'm tired okay
2020-04-03 14:19:40 +02:00
3365466db7
Couplea fixes to the previous tweak
2020-04-03 02:25:16 -07:00
d398c5276c
Also made all these "else ifs" into a "switch"
2020-04-03 01:59:48 -07:00
492546c05c
Pacifist digestion checks are elsewhere anyway
2020-04-03 01:53:35 -07:00
37b6aa9897
Update dwarves.dm
2020-04-03 05:31:37 +02:00
4ef42ba6b1
Dwarfy message spam QoL.
2020-04-03 05:16:17 +02:00
58bc10bd31
Fixing three runtime errors.
2020-04-02 23:33:40 +02:00
9b6cd54abf
there's an extra space and it bugged me im sorry
2020-04-02 00:35:38 -07:00
eeccea989c
purple nerf - light pink gets epi back
2020-04-02 00:34:44 -07:00
Lin