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
736ef2cb7c
Merge pull request #11705 from Ghommie/Ghommie-cit659
...
It's past midnight, time for your runtime errors fixing.
2020-04-01 23:16:29 -07:00
baf5150c51
fixes two runtimes
2020-04-01 22:35:26 -07:00
a9bfe00302
Merge pull request #11701 from Ghommie/Ghommie-cit657
...
Massive megafauna buff.
2020-04-01 20:54:32 -07:00
519ebd5ed8
Porting the mutation conflict system, and resizing quantum realm fix.
2020-04-01 15:29:35 +02:00
881f8765f4
Stufffs
2020-04-01 15:29:40 +03:00
13c474f2af
brawling just got mathematical?
2020-04-01 22:05:22 +11:00
65ec9f3723
Merge remote-tracking branch 'Citadel-Station-13/master' into skateboards_cool_again
2020-04-01 13:03:06 +03:00
4de14fbdf7
Finnishing touches
2020-04-01 12:59:06 +03:00
f40f07b033
[READY]Skateboard overhaul ( #45657 )
...
* skeet skeet
* scoot
* removes debug message
* merge conflict
* oopsie
* polish, new board types
* begone
* actioninja review
* passtable trait
* fixes indent
* dwarfism check
* check for existing flag
* check existing trait
* screwdriver returns FALSE
2020-04-01 12:05:27 +03:00
ca1f3d9a1e
Added succ sound for the victim
2020-04-01 11:45:11 +03:00
82c8710267
Merge pull request #11700 from kiwedespars/papermask
...
adds new cosmetic and craftable paper masks.
2020-04-01 01:03:14 -07:00
6e62ea5cb1
Quickfix for baaad problem
2020-04-01 09:15:31 +03:00
necromanceranne