Artur
2134515d5c
Merge remote-tracking branch 'upstream/master' into tackling_and_lunge
2020-04-15 12:19:37 +03:00
Linzolle
d43cb78b8b
one more
2020-04-14 18:02:51 -05:00
Linzolle
39e6541ccd
remove bad words
2020-04-14 17:54:07 -05:00
Linzolle
f828f4c4b7
Merge remote-tracking branch 'forrest/wewlad' into tos-compliance
2020-04-14 17:33:47 -05:00
Ghom
49e36e47ff
Merge pull request #11809 from kevinz000/storage_rework
...
Adds baystation-style volumetric space storage support
2020-04-14 13:17:11 +02:00
Artur
356f2913d7
Ghommies suggestions and renames a proc
2020-04-14 09:30:14 +03:00
Artur
f910a0fd32
Conflict fixes
2020-04-14 09:27:54 +03:00
Ghommie
db43f53ac4
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit611
2020-04-13 16:15:40 +02:00
kevinz000
105d405d2d
Merge pull request #11837 from Ghommie/Ghommie-cit678
...
Item color removal port fixes.
2020-04-12 22:34:45 -07:00
Ghommie
0d0f14d3f8
Item color removal port fixes.
2020-04-13 03:34:58 +02:00
kevinz000
6b6683846b
Merge pull request #11819 from Ghommie/Ghommie-cit672
...
Minor action datum refactor and spellcasting fix.
2020-04-12 17:02:36 -07:00
kevinz000
8604297dcd
Merge pull request #11811 from Ghommie/Ghommie-cit671
...
Fixes and standarizes a few liver troubles. Re-enables liver failure.
2020-04-12 17:01:50 -07:00
Ghommie
05a954f000
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit611
2020-04-13 02:01:01 +02:00
kevinz000
d60932ca5d
Merge pull request #11697 from Ghommie/Ghommie-cit655
...
Ports "Obliterates item_color: new washing machine functionality edition"
2020-04-12 16:16:37 -07:00
Ghom
b00e97b848
Merge pull request #10732 from kevinz000/eldritch_affairs
...
Eldritch Affairs
2020-04-12 20:47:19 +02:00
Ghom
1babc75a69
Merge pull request #11818 from spookydonut/patch-1
...
Update spacemandmm to 1.4
2020-04-11 23:59:31 +02:00
Ghommie
31e0321808
Minor action datum refactor and spellcasting fix.
2020-04-11 16:53:08 +02:00
Ghom
f9f1bbc05f
Merge pull request #11804 from Akrilla/beepsky-tie
...
Fixes beepsky ziptie weirdness
2020-04-11 13:40:24 +02:00
spookydonut
230e5fca20
fix everything
2020-04-11 15:32:09 +08:00
Akrilla
8abc0cc0a7
!on
2020-04-11 05:24:24 +01:00
Ghom
a75bd30911
Update carbon_defense.dm
2020-04-10 19:54:12 +02:00
Artur
f481be1496
Makin stuff nice and dandy
2020-04-10 20:53:28 +03:00
kevinz000
d5769a6ee4
Update carbon_defense.dm ( #11738 )
2020-04-10 18:13:50 +02:00
Ghommie
af55880794
Fixes and standarizes a few liver troubles. Re-enables liver failure.
2020-04-10 17:22:34 +02:00
Akrilla
2a05903808
do_after
2020-04-10 04:26:35 +01:00
ForrestWick
0a54f8a7a0
I'M SORRY MR GITHUB PLS DONT BEAT ME
2020-04-09 17:27:18 -05:00
Artur
fe755a1424
Tackling Working so far, working on the lunge now
2020-04-09 21:42:00 +03:00
kevinz000
0cd7437f49
Update status_procs.dm
2020-04-09 09:33:21 -07:00
Ghommie
7c1e5aa2c9
Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into Ghommie-cit655
2020-04-09 15:46:19 +02:00
Putnam3145
5078b5875a
Fixes my oldish badcode. ( #11781 )
2020-04-09 14:48:58 +02:00
kevinz000
956a85ab34
Merge pull request #11741 from necromanceranne/pawnch_2_the_pawnchening
...
Punch Changes 2: The Quickening
2020-04-09 02:09:51 -07:00
kevinz000
7ec669ecd4
bet
2020-04-07 16:11:58 -07:00
Lin
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
kevinz000
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
kevinz000
d89170e441
Merge pull request #11748 from Trilbyspaceclone/patch-334
...
Infested plasmamen now are miner type
2020-04-06 15:47:00 -07:00
kevinz000
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
necromanceranne
d1e77ab087
Merge branch 'master' into pawnch_2_the_pawnchening
2020-04-06 12:31:16 +10:00
Putnam
31f4269515
Makes miasma generate correctly, reverts previous pluox change.
2020-04-05 03:23:58 -07:00
Trilbyspaceclone
7ed168da7f
Update hivelord.dm
2020-04-05 03:05:41 -04:00
kevinz000
956c2a57bf
Merge pull request #11729 from Ghommie/Ghommie-cit666
...
Ports the VV Refactor by Kevinz.
2020-04-04 19:19:25 -07:00
kevinz000
2a2234483f
Merge pull request #11727 from Putnam3145/vore-pacifist-fix
...
Makes pacifists able to vore properly
2020-04-04 07:15:54 -07:00
kevinz000
886f0d7500
Merge pull request #11726 from Ghommie/Ghommie-cit665
...
Dwarfy message spam QoL.
2020-04-04 07:11:02 -07:00
necromanceranne
923486eb43
Merge branch 'master' into pawnch_2_the_pawnchening
2020-04-04 13:40:34 +11:00
kevinz000
413ded02c0
Merge pull request #11433 from Ghommie/Ghommie-cit616
...
Spellcasting element
2020-04-03 16:31:10 -07:00
Ghommie
9d97f1acda
Ports the VV Refactor by Kevinz.
2020-04-03 19:16:43 +02:00
Ghom
a9ea7be699
Update dwarves.dm
2020-04-03 18:21:38 +02:00
necromanceranne
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
Putnam
492546c05c
Pacifist digestion checks are elsewhere anyway
2020-04-03 01:53:35 -07:00
necromanceranne
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
Ghom
37b6aa9897
Update dwarves.dm
2020-04-03 05:31:37 +02:00
