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
38586c9d92
I feel like this is more fitting
2020-04-04 20:09:09 +11:00
31c7d70eb1
words are hard
2020-04-04 04:32:59 -04:00
4c051f70e8
fixes this too
2020-04-04 19:16:59 +11:00
bd5446e906
NYOOPS
2020-04-04 18:21:18 +11:00
fcb816675b
not only am I blind I am also dumb
2020-04-04 18:20:17 +11:00
7935eb8364
pretty sure this was brekaing stuff
2020-04-04 17:24:44 +11:00
c6e82382a3
I feel like messing with this is basically unnecessary
2020-04-04 16:51:32 +11:00
8af29a178c
Hooks up the chaplain null rod gloves to the choice of gloves
2020-04-04 16:42:37 +11:00
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
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
48f458cddb
Update uplink_devices.dm
2020-04-04 00:09:02 -04:00
45892cef79
Update science.dm
2020-04-03 23:33:15 -04:00
e8c33c411f
Merge pull request #11723 from Ghommie/Ghommie-cit663
...
Fixing three runtime errors.
2020-04-04 02:53:18 +00:00
923486eb43
Merge branch 'master' into pawnch_2_the_pawnchening
2020-04-04 13:40:34 +11: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
56669f9296
Minor snowflakes clothing variations refactor. Removal of copypasted states.
2020-04-04 00:22:18 +02: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
0c46c151f9
Changes the vast majority of punching to be more changable with gear, martial arts now utilize species punch values for damage.
2020-04-03 19:42:25 +11:00
7da4ad5694
Damned title doesnt want to show up
2020-04-03 10:29:07 +03: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
b37dc1e322
Merge branch 'punch' into pawnch_2_the_pawnchening
2020-04-03 14:02:42 +11:00
e1a013bcb2
I'm tired okay
2020-04-03 11:30:00 +11:00
c481db2bfd
nearly added instastun king hits, now stun punches are more rng
2020-04-03 11:25:29 +11:00
f26a9b948c
pawnch harder get tired less this is a balance change now I guess
2020-04-03 10:50:26 +11:00
991f73893f
Fuck me im tired
2020-04-03 02:00:41 +03:00
67f4319177
fixes burn regen and some tweaks
2020-04-03 01:52:08 +03:00
58bc10bd31
Fixing three runtime errors.
2020-04-02 23:33:40 +02:00
6b3de998c0
remove noreact from being used in plants
2020-04-02 21:18:27 +01:00
0dcc630c4a
ports some trait changes
2020-04-02 21:15:04 +01:00
45d1917f0f
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit655
2020-04-02 16:07:13 +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
d9e8db8a6c
Update _status_effects.dm
2020-04-01 23:31:51 -07:00
kevinz000